vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-09-21 11:40:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixing wrong reference variable

Browse Source
This commit is contained in:
Ezequiel Bergamaschi 2014-04-19 14:18:35 -03:00
parent bfe24b7dfb
commit 754d4b3dcf
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wise-webapp/src/main/webapp/js/mindmapList.js
View File

@ -66,7 +66,6 @@ jQuery.fn.dataTableExt.removeSelectedRows = function () {
updateStatusToolbar(); updateStatusToolbar();
}; };
jQuery.fn.dialogForm = function (options) { jQuery.fn.dialogForm = function (options) {
var containerId = this[0].id; var containerId = this[0].id;
@ -79,7 +78,7 @@ jQuery.fn.dialogForm = function (options) {
// Clear form values ... // Clear form values ...
if (options.clearForm == undefined || options.clearForm) { if (options.clearForm == undefined || options.clearForm) {
//FIXME: icon and color should be handled as exceptions.. //FIXME: icon and color should be handled as exceptions..
$("#" + containerId).find('input[name!="color"]input[name!="icon"]').val(''); $("#" + containerId).find('input[name!="color"]input[name!="iconName"]').val('');
} }
// Clear button "Saving..." state ... // Clear button "Saving..." state ...
@ -178,7 +177,6 @@ jQuery.fn.dialogForm = function (options) {
}; };
// Update toolbar events ... // Update toolbar events ...
function updateStatusToolbar() { function updateStatusToolbar() {
@ -567,7 +565,7 @@ function createLabelItem(data, id) {
var labelItem = $("<li data-filter=\"" + data.title + "\">"); var labelItem = $("<li data-filter=\"" + data.title + "\">");
labelItem.append( labelItem.append(
"<a href=\"#\"> " + "<a href=\"#\"> " +
"<i class=\"" + data.icon + " labelIcon\"></i>" + "<i class=\"" + data.iconName + " labelIcon\"></i>" +
"<div class='labelColor' style='background: " + data.color + "'></div>" + "<div class='labelColor' style='background: " + data.color + "'></div>" +
"<div class='labelName labelNameList'>" + data.title + "</div>" + "<div class='labelName labelNameList'>" + data.title + "</div>" +
"<button id='deleteLabelBtn' class='close closeLabel' labelid=\""+ labelId +"\">x</button>" + "<button id='deleteLabelBtn' class='close closeLabel' labelid=\""+ labelId +"\">x</button>" +
@ -641,7 +639,7 @@ function prepareLabelList(labels) {
$('<li class="chooseLabel"></li>').attr('value', value.id).attr('color', value.color).attr('icon', value.icon) $('<li class="chooseLabel"></li>').attr('value', value.id).attr('color', value.color).attr('icon', value.icon)
.append( .append(
'<a href="#" onclick="return false">' + '<a href="#" onclick="return false">' +
"<div class='labelIcon " + value.icon + "'></div>" + "<div class='labelIcon " + value.iconName + "'></div>" +
"<div class='labelColor' style='background: " + value.color + "'></div>" + "<div class='labelColor' style='background: " + value.color + "'></div>" +
"<div class='labelName'>" + value.title + "</div>" + "<div class='labelName'>" + value.title + "</div>" +
'</a>') '</a>')

2
wise-webapp/src/main/webapp/jsp/mindmapList.jsp
View File

@ -354,7 +354,7 @@
</div> </div>
<div id="iconGroup" class="form-group"> <div id="iconGroup" class="form-group">
<label class="col-md-3 control-label" for="iconChooser"><spring:message code="ICON"/>:</label> <label class="col-md-3 control-label" for="iconChooser"><spring:message code="ICON"/>:</label>
<input class="form-control" name="icon" id="iconChooser" style="display: none" required="required" value="glyphicon glyphicon-tag"/> <input class="form-control" name="iconName" id="iconChooser" style="display: none" required="required" value="glyphicon glyphicon-tag"/>
<div class="col-md-1"> <div class="col-md-1">
<div class="btn dropdown-toggle" id="defaultIcon" data-toggle="dropdown"> <div class="btn dropdown-toggle" id="defaultIcon" data-toggle="dropdown">
<i class="glyphicon glyphicon-tag"></i> <i class="glyphicon glyphicon-tag"></i>