aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 09:58:27 -0700
committerJonathan Duran2012-05-09 09:58:27 -0700
commit48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree899f9cf1b09a01bc073f92ab498236aed80b38ec /js/panels/color
parent2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/color')
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.html2
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html2
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html2
-rwxr-xr-xjs/panels/color/colorpopup-manager.js2
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.html2
5 files changed, 5 insertions, 5 deletions
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 @@
28 28
29 <body> 29 <body>
30 30
31 <div id="cc_popup" class="cc_popup"> 31 <div data-montage-id="cc_popup" class="cc_popup">
32 <div id="cc_pu_options"> 32 <div id="cc_pu_options">
33 33
34 <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div> 34 <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div>
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 @@
26 26
27 <body> 27 <body>
28 28
29 <div id="cp_expanded" class="cp_expanded"> 29 <div data-montage-id="cp_expanded" class="cp_expanded">
30 <div class="cp_history"> 30 <div class="cp_history">
31 <button class="cp_color_current">Current Color</button> 31 <button class="cp_color_current">Current Color</button>
32 <button class="cp_color_previous">Previous Color</button> 32 <button class="cp_color_previous">Previous Color</button>
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 @@
26 26
27 <body> 27 <body>
28 28
29 <div id="cpp_popup" class="cpp_popup"> 29 <div data-montage-id="cpp_popup" class="cpp_popup">
30 <div class="cp_pu_options"> 30 <div class="cp_pu_options">
31 31
32 <div class="cp_pu_history"> 32 <div class="cp_pu_history">
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, {
70 // 70 //
71 document.addEventListener('mousedown', function (e) { 71 document.addEventListener('mousedown', function (e) {
72 // 72 //
73 if (e._event.srcElement.id === 'stageCanvas' || e._event.srcElement.id === 'mainContainer' || e._event.srcElement.id === 'drawingCanvas') { 73 if (e._event.srcElement.getAttribute('data-montage-id') === 'stageCanvas' || e._event.srcElement.id === 'mainContainer' || e._event.srcElement.getAttribute('data-montage-id') === 'drawingCanvas') {
74 this.application.ninja.colorController.colorPopupManager.hideColorPopup(); 74 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
75 } 75 }
76 }.bind(this)); 76 }.bind(this));
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 @@
28 28
29 <body> 29 <body>
30 30
31 <div id="colortoolbar" class="colortoolbar"> 31 <div data-montage-id="colortoolbar" class="colortoolbar">
32 32
33 <div class="cpe_stroke_icon selected"></div> 33 <div class="cpe_stroke_icon selected"></div>
34 34