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 /js/components
parent: be1806505f4af86c3b5c15454e67cb8cec696554 (diff)
parent: 4feaf41f201e56c1332208851d7dee4f060aaf89 (diff)
download: ninja-9f654de3c56475b8e9d34183eb6dd9f2d0381b76.tar.gz
5 files changed, 5 insertions, 5 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>
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 /js/components
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>