aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/color
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels/color')
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.html7
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html7
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html7
-rwxr-xr-xjs/panels/color/colorpopup-manager.js2
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.html7
5 files changed, 13 insertions, 17 deletions
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html
index 1ae40cc1..cdb26894 100755
--- a/js/panels/color/colorchippopup.reel/colorchippopup.html
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- 2<!--
3 <copyright> 3 <copyright>
4 This file contains proprietary software owned by Motorola Mobility, Inc. 4 This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -16,8 +16,7 @@
16 <script type="text/montage-serialization"> 16 <script type="text/montage-serialization">
17 { 17 {
18 "owner": { 18 "owner": {
19 "module": "js/panels/Color/colorchippopup.reel", 19 "prototype": "js/panels/Color/colorchippopup.reel",
20 "name": "colorchippopup",
21 "properties": { 20 "properties": {
22 "element": {"#": "cc_popup"} 21 "element": {"#": "cc_popup"}
23 } 22 }
@@ -29,7 +28,7 @@
29 28
30 <body> 29 <body>
31 30
32 <div id="cc_popup" class="cc_popup"> 31 <div data-montage-id="cc_popup" class="cc_popup">
33 <div id="cc_pu_options"> 32 <div id="cc_pu_options">
34 33
35 <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 d4330596..19bc4b6b 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.html
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -13,8 +13,7 @@
13 <script type="text/montage-serialization"> 13 <script type="text/montage-serialization">
14 { 14 {
15 "owner": { 15 "owner": {
16 "module": "js/panels/Color/ColorPanelBase.reel", 16 "prototype": "js/panels/Color/ColorPanelBase.reel",
17 "name": "ColorPanelBase",
18 "properties": { 17 "properties": {
19 "element": {"#": "cp_expanded"} 18 "element": {"#": "cp_expanded"}
20 } 19 }
@@ -27,7 +26,7 @@
27 26
28 <body> 27 <body>
29 28
30 <div id="cp_expanded" class="cp_expanded"> 29 <div data-montage-id="cp_expanded" class="cp_expanded">
31 <div class="cp_history"> 30 <div class="cp_history">
32 <button class="cp_color_current">Current Color</button> 31 <button class="cp_color_current">Current Color</button>
33 <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 feebb45c..f65d5bc0 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -14,8 +14,7 @@
14 <script type="text/montage-serialization"> 14 <script type="text/montage-serialization">
15 { 15 {
16 "owner": { 16 "owner": {
17 "module": "js/panels/Color/colorpanelpopup.reel", 17 "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]",
18 "name": "ColorPanelPopup",
19 "properties": { 18 "properties": {
20 "element": {"#": "cpp_popup"} 19 "element": {"#": "cpp_popup"}
21 } 20 }
@@ -27,7 +26,7 @@
27 26
28 <body> 27 <body>
29 28
30 <div id="cpp_popup" class="cpp_popup"> 29 <div data-montage-id="cpp_popup" class="cpp_popup">
31 <div class="cp_pu_options"> 30 <div class="cp_pu_options">
32 31
33 <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 9ab54836..6561ed99 100755
--- a/js/panels/color/colortoolbar.reel/colortoolbar.html
+++ b/js/panels/color/colortoolbar.reel/colortoolbar.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2 2
3<!DOCTYPE html> 3<!DOCTYPE html>
4<!-- <copyright> 4<!-- <copyright>
@@ -16,8 +16,7 @@
16 { 16 {
17 17
18 "owner": { 18 "owner": {
19 "module": "js/panels/Color/colortoolbar.reel", 19 "prototype": "js/panels/Color/colortoolbar.reel[ColorToolbar]",
20 "name": "ColorToolbar",
21 "properties": { 20 "properties": {
22 "element": {"#": "colortoolbar"} 21 "element": {"#": "colortoolbar"}
23 } 22 }
@@ -29,7 +28,7 @@
29 28
30 <body> 29 <body>
31 30
32 <div id="colortoolbar" class="colortoolbar"> 31 <div data-montage-id="colortoolbar" class="colortoolbar">
33 32
34 <div class="cpe_stroke_icon selected"></div> 33 <div class="cpe_stroke_icon selected"></div>
35 34
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 19:55:48 +0000