Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
author: John Mayhew 2012-05-07 16:30:19 -0700
committer: John Mayhew 2012-05-07 16:30:19 -0700
commit: db4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree: 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/panels/color
parent: 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent: 526e423e4a2734c2b139af23911e912452a4443f (diff)
download: ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
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 @@
        
        <body>
    
-        <div id="cc_popup" class="cc_popup">
+        <div data-montage-id="cc_popup" class="cc_popup">
                <div id="cc_pu_options">
                        
                        <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 @@
        
        <body>
    
-        <div id="cp_expanded" class="cp_expanded">
+        <div data-montage-id="cp_expanded" class="cp_expanded">
                <div class="cp_history">
                        <button class="cp_color_current">Current Color</button>
                        <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 @@
        
        <body>
    
-        <div id="cpp_popup" class="cpp_popup">
+        <div data-montage-id="cpp_popup" class="cpp_popup">
                <div class="cp_pu_options">
                        
                        <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, {
            //
            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));
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 @@
    <body>
-        <div id="colortoolbar" class="colortoolbar">
+        <div data-montage-id="colortoolbar" class="colortoolbar">
                <div class="cpe_stroke_icon selected"></div>
author	John Mayhew	2012-05-07 16:30:19 -0700
committer	John Mayhew	2012-05-07 16:30:19 -0700
commit	db4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree	8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/panels/color
parent	843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent	526e423e4a2734c2b139af23911e912452a4443f (diff)
download	ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz

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