From 89e1bd46b03c38a8f95a87a0c95a127f149cfd86 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Mon, 26 Mar 2012 13:36:41 -0700 Subject: Fix: IKNINJA-1362 --- js/panels/color/colorpopup-manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js index a4c9a8c2..d6d94807 100755 --- a/js/panels/color/colorpopup-manager.js +++ b/js/panels/color/colorpopup-manager.js @@ -68,7 +68,7 @@ exports.ColorPopupManager = Montage.create(Component, { this.application.ninja.colorController.colorPopupManager.hideColorPopup(); }.bind(this)); // - document.addEventListener('click', function (e) { + document.addEventListener('mousedown', function (e) { // if (e._event.srcElement.id === 'stageCanvas' || e._event.srcElement.id === 'mainContainer' || e._event.srcElement.id === 'drawingCanvas') { this.application.ninja.colorController.colorPopupManager.hideColorPopup(); -- cgit v1.2.3 From 23b89609d7fc26f3523b4a8e354fa8c8208cbdbf Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Mon, 26 Mar 2012 14:05:12 -0700 Subject: Fix: IKNINJA-1355 --- js/controllers/color-controller.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js index 53573baf..8e000b19 100755 --- a/js/controllers/color-controller.js +++ b/js/controllers/color-controller.js @@ -198,7 +198,6 @@ exports.ColorController = Montage.create(Component, { handleChange: { enumerable: true, value: function (e) { - // var actionEvent, color, input = e._event.input, panelMode, mode = e._event.mode; if (this.colorView) { @@ -228,14 +227,14 @@ exports.ColorController = Montage.create(Component, { // this.fill = color; // - if(e._event.wasSetByCode) return; + if(e._event.wasSetByCode && mode !== 'nocolor') return; // this.setColor(mode, color, true); } else if (input === 'stroke') { // this.stroke = color; // - if(e._event.wasSetByCode) return; + if(e._event.wasSetByCode && mode !== 'nocolor') return; this.setColor(mode, color, false); } -- cgit v1.2.3