Merge remote-tracking branch 'origin/develop' into feature/remove_mootols
This commit is contained in:
Ezequiel Bergamaschi
20
wise-webapp/src/main/webapp/js/jquery.timeago.en_us.js
Normal file
20
wise-webapp/src/main/webapp/js/jquery.timeago.en_us.js
Normal file
@@ -0,0 +1,20 @@
|
||||
// English (US)
|
||||
jQuery.timeago.settings.strings = {
|
||||
prefixAgo: null,
|
||||
prefixFromNow: null,
|
||||
suffixAgo: "ago",
|
||||
suffixFromNow: "from now",
|
||||
seconds: "less than a minute",
|
||||
minute: "about a minute",
|
||||
minutes: "%d minutes",
|
||||
hour: "about an hour",
|
||||
hours: "about %d hours",
|
||||
day: "a day",
|
||||
days: "%d days",
|
||||
month: "about a month",
|
||||
months: "%d months",
|
||||
year: "about a year",
|
||||
years: "%d years",
|
||||
wordSeparator: " ",
|
||||
numbers: []
|
||||
};
|
||||
@@ -66,7 +66,6 @@ jQuery.fn.dataTableExt.removeSelectedRows = function () {
|
||||
updateStatusToolbar();
|
||||
};
|
||||
|
||||
|
||||
jQuery.fn.dialogForm = function (options) {
|
||||
|
||||
var containerId = this[0].id;
|
||||
@@ -78,7 +77,8 @@ jQuery.fn.dialogForm = function (options) {
|
||||
|
||||
// Clear form values ...
|
||||
if (options.clearForm == undefined || options.clearForm) {
|
||||
$("#" + containerId).find('input[name!="color"]').val('');
|
||||
//FIXME: icon and color should be handled as exceptions..
|
||||
$("#" + containerId).find('input[name!="color"]input[name!="iconName"]').val('');
|
||||
}
|
||||
|
||||
// Clear button "Saving..." state ...
|
||||
@@ -177,7 +177,6 @@ jQuery.fn.dialogForm = function (options) {
|
||||
|
||||
};
|
||||
|
||||
|
||||
// Update toolbar events ...
|
||||
function updateStatusToolbar() {
|
||||
|
||||
@@ -185,14 +184,14 @@ function updateStatusToolbar() {
|
||||
$("#mindmapListTable tbody input:checked").parent().parent().addClass('row-selected');
|
||||
$("#mindmapListTable tbody input:not(:checked)").parent().parent().removeClass('row-selected');
|
||||
|
||||
$('.buttonsToolbar').find('.act-single').hide().end().find('.act-multiple').hide();
|
||||
$('.buttonsToolbar').find('.act-single').fadeOut('slow').end().find('.act-multiple').fadeOut('slow');
|
||||
|
||||
var tableElem = $('#mindmapListTable');
|
||||
var selectedRows = tableElem.dataTableExt.getSelectedRows();
|
||||
|
||||
if (selectedRows.length > 0) {
|
||||
if (selectedRows.length == 1) {
|
||||
$('.buttonsToolbar').find('.act-single').show().end().find('.act-multiple').show();
|
||||
$('.buttonsToolbar').find('.act-single').fadeIn('slow').end().find('.act-multiple').fadeIn('slow');
|
||||
|
||||
// Can be executed by the owner ?
|
||||
var rowData = tableElem.dataTable().fnGetData(selectedRows[0]);
|
||||
@@ -202,7 +201,7 @@ function updateStatusToolbar() {
|
||||
$(".buttonsToolbar").find('#publishBtn').hide().end().find('#shareBtn').hide().end().find('#renameBtn').hide();
|
||||
}
|
||||
} else {
|
||||
$(".buttonsToolbar .act-multiple").show();
|
||||
$(".buttonsToolbar .act-multiple").fadeIn('slow');
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -254,8 +253,23 @@ function updateStarred(spanElem) {
|
||||
|
||||
function callbackOnTableInit() {
|
||||
// Register starred events ...
|
||||
$('#mindmapListTable .starredOff, #mindmapListTable .starredOn').click(function () {
|
||||
$('#mindmapListTable .starredOff, #mindmapListTable .starredOn').click(function (event) {
|
||||
updateStarred(this);
|
||||
event.stopPropagation();
|
||||
});
|
||||
|
||||
$("#mindmapListTable tbody tr").click(
|
||||
function(event) {
|
||||
var target = $(event.target);
|
||||
if (!target.is('.closeTag')){
|
||||
if (!target.parent().is('.closeTag')) {
|
||||
var baseUrl = window.location.href.substring(0, window.location.href.lastIndexOf("c/maps/"));
|
||||
window.open(baseUrl + 'c/maps/' + $(this).find('.mindmapName').attr('value') + '/edit' , '_self');
|
||||
}
|
||||
}
|
||||
});
|
||||
$('input:checkbox').click(function(event) {
|
||||
event.stopPropagation();
|
||||
});
|
||||
updateStatusToolbar();
|
||||
}
|
||||
@@ -286,10 +300,15 @@ $(function () {
|
||||
postUpdate: function(data, id) {
|
||||
createLabelItem(data, id);
|
||||
if (mapIds.length > 0) {
|
||||
linkLabelToMindmap(mapIds, {id: id, title: data.title, color: data.color});
|
||||
linkLabelToMindmap(mapIds, {id: id, title: data.title, color: data.color, icon: data.icon});
|
||||
}
|
||||
}
|
||||
});
|
||||
// Setting sizes to label icon list
|
||||
var dropDownHeight = $(window).height()/3;
|
||||
$("#labelIconItems ul").height(dropDownHeight);
|
||||
var dropDownWidth = $(window).width()/3;
|
||||
$("#labelIconItems ul").width(dropDownWidth);
|
||||
}
|
||||
);
|
||||
|
||||
@@ -474,9 +493,9 @@ $(function () {
|
||||
})
|
||||
});
|
||||
|
||||
$(document).on('click', ".closeTag", function() {
|
||||
$(document).on('click', ".closeTag", function(event) {
|
||||
var me = $(this);
|
||||
var mindmapId = me.parents("td").find("a").attr("value");
|
||||
var mindmapId = me.parents("td").find(".mindmapName").attr("value");
|
||||
var data = {
|
||||
id: me.attr("value"),
|
||||
title: me.attr("name"),
|
||||
@@ -516,7 +535,28 @@ $(function () {
|
||||
$("#foldersContainer ul").css('overflow-x', 'hidden');
|
||||
$("#foldersContainer ul").height(maxHeight);
|
||||
|
||||
})
|
||||
});
|
||||
|
||||
//init popovers...
|
||||
var icons = $(".bs-glyphicons-list li");
|
||||
icons.each(function() {
|
||||
$(this).popover({
|
||||
animation: true,
|
||||
placement: "auto",
|
||||
trigger: 'hover',
|
||||
//FIXME: Which is the best way to use messages.properties here?
|
||||
content: ($(this).attr('class').replace('glyphicon glyphicon-',''))
|
||||
})
|
||||
});
|
||||
|
||||
icons.on("click", function(){
|
||||
var defaultIcon = $("#defaultIcon");
|
||||
//remove current icon
|
||||
defaultIcon.find("i").remove();
|
||||
var myClass = $(this).attr("class");
|
||||
defaultIcon.prepend("<i class='" + myClass +"'></i>");
|
||||
defaultIcon.closest("#iconGroup").find('input').val(myClass);
|
||||
});
|
||||
});
|
||||
|
||||
/*--------------------------------------------- Label actions --------------------------------------------------**/
|
||||
@@ -525,7 +565,7 @@ function createLabelItem(data, id) {
|
||||
var labelItem = $("<li data-filter=\"" + data.title + "\">");
|
||||
labelItem.append(
|
||||
"<a href=\"#\"> " +
|
||||
"<i class=\"glyphicon glyphicon-tag labelIcon\"></i>" +
|
||||
"<i class=\"" + data.iconName + " labelIcon\"></i>" +
|
||||
"<div class='labelColor' style='background: " + data.color + "'></div>" +
|
||||
"<div class='labelName labelNameList'>" + data.title + "</div>" +
|
||||
"<button id='deleteLabelBtn' class='close closeLabel' labelid=\""+ labelId +"\">x</button>" +
|
||||
@@ -596,9 +636,10 @@ function prepareLabelList(labels) {
|
||||
//append items to dropdown
|
||||
$.each(labels, function(index, value) {
|
||||
labelList.append(
|
||||
$('<li class="chooseLabel"></li>').attr('value', value.id).attr('color', value.color)
|
||||
$('<li class="chooseLabel"></li>').attr('value', value.id).attr('color', value.color).attr('icon', value.icon)
|
||||
.append(
|
||||
'<a href="#" onclick="return false">' +
|
||||
"<div class='labelIcon " + value.iconName + "'></div>" +
|
||||
"<div class='labelColor' style='background: " + value.color + "'></div>" +
|
||||
"<div class='labelName'>" + value.title + "</div>" +
|
||||
'</a>')
|
||||
|
||||
Reference in New Issue
Block a user