Skip to content

O
OpenBoard
Commit 17c3184b authored by Claudio Valerio's avatar Claudio Valerio
Browse files
Options

fixed issue 1225

parent 0c555c9c
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
resources/library/applications/Nuancier.wgt/js/colorpicker.js
View file @ 17c3184b
...@@ -70,12 +70,12 @@ ...@@ -70,12 +70,12 @@
$("div.tools_change").removeClass("tools_compass"); $("div.tools_change").removeClass("tools_compass");
window.sankore.setTool('pen'); window.sankore.setTool('pen');
window.sankore.setPenColor('#' + HSBToHex(hsb)); window.sankore.setPenColor('#' + HSBToHex(hsb));
sankore.returnStatus("PEN installed", penFlag); //sankore.returnStatus("PEN installed", penFlag);
} else { } else {
$("div.tools_change").addClass("tools_compass"); $("div.tools_change").addClass("tools_compass");
window.sankore.setTool('compass'); window.sankore.setTool('compass');
window.sankore.setPenColor('#' + HSBToHex(hsb)); window.sankore.setPenColor('#' + HSBToHex(hsb));
sankore.returnStatus("Compass installed", penFlag); //sankore.returnStatus("Compass installed", penFlag);
} }
}, },
keyDown = function (ev) { keyDown = function (ev) {
...@@ -224,12 +224,12 @@ ...@@ -224,12 +224,12 @@
$("div.tools_change").removeClass("tools_compass"); $("div.tools_change").removeClass("tools_compass");
window.sankore.setTool('pen'); window.sankore.setTool('pen');
window.sankore.setPenColor('#' + HSBToHex(tmpColor.b)); window.sankore.setPenColor('#' + HSBToHex(tmpColor.b));
sankore.returnStatus("PEN installed", penFlag); //sankore.returnStatus("PEN installed", penFlag);
} else { } else {
$("div.tools_change").addClass("tools_compass"); $("div.tools_change").addClass("tools_compass");
window.sankore.setTool('compass'); window.sankore.setTool('compass');
window.sankore.setPenColor('#' + HSBToHex(tmpColor.b)); window.sankore.setPenColor('#' + HSBToHex(tmpColor.b));
sankore.returnStatus("Compass installed", penFlag); //sankore.returnStatus("Compass installed", penFlag);
} }
//$(tmpColor.a).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(tmpColor.b)); //$(tmpColor.a).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(tmpColor.b));
return false; return false;
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el); cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el);
penFlag = (penFlag)?false:true; penFlag = (penFlag)?false:true;
setNewColor(col, cal.get(0)); setNewColor(col, cal.get(0));
sankore.returnStatus("startEditing()", penFlag); //sankore.returnStatus("startEditing()", penFlag);
}, },
show = function (ev) { show = function (ev) {
var cal = $('#' + $(this).data('colorpickerId')); var cal = $('#' + $(this).data('colorpickerId'));
...@@ -604,4 +604,4 @@ ...@@ -604,4 +604,4 @@
ColorPickerShow: ColorPicker.showPicker, ColorPickerShow: ColorPicker.showPicker,
ColorPickerSetColor: ColorPicker.setColor ColorPickerSetColor: ColorPicker.setColor
}); });
})(jQuery) })(jQuery)
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment