Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-id

author: Valerio Virgillito 2012-05-03 10:58:23 -0700
committer: Valerio Virgillito 2012-05-03 10:58:23 -0700
commit: 9f654de3c56475b8e9d34183eb6dd9f2d0381b76 (patch)
tree: e6ba6681343eacc0de4935666506facaa5ca0b9a
parent: be1806505f4af86c3b5c15454e67cb8cec696554 (diff)
parent: 4feaf41f201e56c1332208851d7dee4f060aaf89 (diff)
download: ninja-9f654de3c56475b8e9d34183eb6dd9f2d0381b76.tar.gz
9 files changed, 9 insertions, 9 deletions
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html
index c5bc186a..2e189c87 100755
--- a/js/components/colorbar.reel/colorbar.html
+++ b/js/components/colorbar.reel/colorbar.html
@@ -29,7 +29,7 @@
        
        <body>
    
-        <canvas id="colorbar" class="colorbar"></canvas>
+        <canvas data-montage-id="colorbar" class="colorbar"></canvas>
    
        </body>
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html
index ef955c2d..707bd637 100755
--- a/js/components/colorwheel.reel/colorwheel.html
+++ b/js/components/colorwheel.reel/colorwheel.html
@@ -29,7 +29,7 @@
        
        <body>
    
-        <div id="colorwheel" class="colorwheel">
+        <div data-montage-id="colorwheel" class="colorwheel">
                <canvas></canvas>
                <canvas></canvas>
                <canvas></canvas>
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index afd42925..b0e23653 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -29,7 +29,7 @@
        
        <body>
    
-        <div id="gradientpicker" class="gradientpicker">
+        <div data-montage-id="gradientpicker" class="gradientpicker">
                
                <div class="type">
                        <input type="radio" class="cp_gp_linear radio" name="gradient" value="linear" id="cp_gp_linear" checked="like a boss"/><label for="cp_gp_linear">Linear Gradient</label>
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html
index 1ae93e15..399a2115 100755
--- a/js/components/popup-manager.reel/popup-manager.html
+++ b/js/components/popup-manager.reel/popup-manager.html
@@ -26,7 +26,7 @@
        
        <body>
    
-        <section id="popupWindows"></section>
+        <section data-montage-id="popupWindows"></section>
    
        </body>
diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html
index 212a681f..cc31106e 100755
--- a/js/components/popup.reel/popup.html
+++ b/js/components/popup.reel/popup.html
@@ -26,7 +26,7 @@
        
        <body>
    
-        <div id="default_popup" class="default_popup">
+        <div data-montage-id="default_popup" class="default_popup">
                <div class="tooltip"><span/></div>
                <div class="content"></div>
        </div>
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/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	Valerio Virgillito	2012-05-03 10:58:23 -0700
committer	Valerio Virgillito	2012-05-03 10:58:23 -0700
commit	9f654de3c56475b8e9d34183eb6dd9f2d0381b76 (patch)
tree	e6ba6681343eacc0de4935666506facaa5ca0b9a
parent	be1806505f4af86c3b5c15454e67cb8cec696554 (diff)
parent	4feaf41f201e56c1332208851d7dee4f060aaf89 (diff)
download	ninja-9f654de3c56475b8e9d34183eb6dd9f2d0381b76.tar.gz

diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html index c5bc186a..2e189c87 100755 --- a/js/components/colorbar.reel/colorbar.html +++ b/js/components/colorbar.reel/colorbar.html
@@ -29,7 +29,7 @@
29		29
30	<body>	30	<body>
31		31
32	<canvas id="colorbar" class="colorbar"></canvas>	32	<canvas data-montage-id="colorbar" class="colorbar"></canvas>
33		33
34	</body>	34	</body>
35		35


diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index ef955c2d..707bd637 100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html
@@ -29,7 +29,7 @@
29		29
30	<body>	30	<body>
31		31
32	<div id="colorwheel" class="colorwheel">	32	<div data-montage-id="colorwheel" class="colorwheel">
33	<canvas></canvas>	33	<canvas></canvas>
34	<canvas></canvas>	34	<canvas></canvas>
35	<canvas></canvas>	35	<canvas></canvas>


diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html index afd42925..b0e23653 100755 --- a/js/components/gradientpicker.reel/gradientpicker.html +++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -29,7 +29,7 @@
29		29
30	<body>	30	<body>
31		31
32	<div id="gradientpicker" class="gradientpicker">	32	<div data-montage-id="gradientpicker" class="gradientpicker">
33		33
34	<div class="type">	34	<div class="type">
35	<input type="radio" class="cp_gp_linear radio" name="gradient" value="linear" id="cp_gp_linear" checked="like a boss"/><label for="cp_gp_linear">Linear Gradient</label>	35	<input type="radio" class="cp_gp_linear radio" name="gradient" value="linear" id="cp_gp_linear" checked="like a boss"/><label for="cp_gp_linear">Linear Gradient</label>


diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html index 1ae93e15..399a2115 100755 --- a/js/components/popup-manager.reel/popup-manager.html +++ b/js/components/popup-manager.reel/popup-manager.html
@@ -26,7 +26,7 @@
26		26
27	<body>	27	<body>
28		28
29	<section id="popupWindows"></section>	29	<section data-montage-id="popupWindows"></section>
30		30
31	</body>	31	</body>
32		32


diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html index 212a681f..cc31106e 100755 --- a/js/components/popup.reel/popup.html +++ b/js/components/popup.reel/popup.html
@@ -26,7 +26,7 @@
26		26
27	<body>	27	<body>
28		28
29	<div id="default_popup" class="default_popup">	29	<div data-montage-id="default_popup" class="default_popup">
30	<div class="tooltip"><span/></div>	30	<div class="tooltip"><span/></div>
31	<div class="content"></div>	31	<div class="content"></div>
32	</div>	32	</div>


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/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