From 4feaf41f201e56c1332208851d7dee4f060aaf89 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Thu, 3 May 2012 09:59:47 -0700 Subject: Changing ID to Montage-ID for Color Panel --- js/panels/color/colorchippopup.reel/colorchippopup.html | 2 +- js/panels/color/colorpanelbase.reel/colorpanelbase.html | 2 +- js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | 2 +- js/panels/color/colortoolbar.reel/colortoolbar.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'js/panels/color') diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html index ff0c6498..cdb26894 100755 --- a/js/panels/color/colorchippopup.reel/colorchippopup.html +++ b/js/panels/color/colorchippopup.reel/colorchippopup.html @@ -28,7 +28,7 @@ -
+
#
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html index f40bd448..19bc4b6b 100755 --- a/js/panels/color/colorpanelbase.reel/colorpanelbase.html +++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html @@ -26,7 +26,7 @@ -
+
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html index 0698a6dc..f65d5bc0 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html @@ -26,7 +26,7 @@ -
+
diff --git a/js/panels/color/colortoolbar.reel/colortoolbar.html b/js/panels/color/colortoolbar.reel/colortoolbar.html index e32a475c..6561ed99 100755 --- a/js/panels/color/colortoolbar.reel/colortoolbar.html +++ b/js/panels/color/colortoolbar.reel/colortoolbar.html @@ -28,7 +28,7 @@ -
+
-- cgit v1.2.3 From 5e31f3a573307ffc17a19613a604a50feb7d0d51 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 4 May 2012 14:49:47 -0700 Subject: Fixing the color popup Signed-off-by: Valerio Virgillito --- js/panels/color/colorpopup-manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/panels/color') diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js index d6d94807..529ec1c8 100755 --- a/js/panels/color/colorpopup-manager.js +++ b/js/panels/color/colorpopup-manager.js @@ -70,7 +70,7 @@ exports.ColorPopupManager = Montage.create(Component, { // document.addEventListener('mousedown', function (e) { // - if (e._event.srcElement.id === 'stageCanvas' || e._event.srcElement.id === 'mainContainer' || e._event.srcElement.id === 'drawingCanvas') { + if (e._event.srcElement.getAttribute('data-montage-id') === 'stageCanvas' || e._event.srcElement.id === 'mainContainer' || e._event.srcElement.getAttribute('data-montage-id') === 'drawingCanvas') { this.application.ninja.colorController.colorPopupManager.hideColorPopup(); } }.bind(this)); -- cgit v1.2.3