diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/color | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/color')
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 | ||