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/components | |
| 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/components')
60 files changed, 201 insertions, 209 deletions
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html index 1f41699e..ecdd4389 100644 --- a/js/components/about-box.reel/about-box.html +++ b/js/components/about-box.reel/about-box.html | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | </script> | 21 | </script> |
| 22 | </head> | 22 | </head> |
| 23 | <body> | 23 | <body> |
| 24 | <div class="mainAboutBoxContainer" id="mainAboutBoxContainer"> | 24 | <div data-montage-id="mainAboutBoxContainer" class="mainAboutBoxContainer"> |
| 25 | <div id="about_box_ninja_logo"></div> | 25 | <div id="about_box_ninja_logo"></div> |
| 26 | <div id="aboutBoxTextBlock" class="baseAboutBoxText"> | 26 | <div id="aboutBoxTextBlock" class="baseAboutBoxText"> |
| 27 | <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p> | 27 | <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p> |
diff --git a/js/components/checkbox.reel/checkbox.html b/js/components/checkbox.reel/checkbox.html index a03d72fb..ded91fc2 100755 --- a/js/components/checkbox.reel/checkbox.html +++ b/js/components/checkbox.reel/checkbox.html | |||
| @@ -18,6 +18,6 @@ | |||
| 18 | </script> | 18 | </script> |
| 19 | </head> | 19 | </head> |
| 20 | <body> | 20 | <body> |
| 21 | <input id="ch_comp" class="nj-skinned" type="checkbox"> | 21 | <input data-montage-id="ch_comp" class="nj-skinned" type="checkbox"> |
| 22 | </body> | 22 | </body> |
| 23 | </html> \ No newline at end of file | 23 | </html> \ No newline at end of file |
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/combobox.reel/combobox.html b/js/components/combobox.reel/combobox.html index a68dd37f..81920005 100755 --- a/js/components/combobox.reel/combobox.html +++ b/js/components/combobox.reel/combobox.html | |||
| @@ -18,6 +18,6 @@ | |||
| 18 | </script> | 18 | </script> |
| 19 | </head> | 19 | </head> |
| 20 | <body> | 20 | <body> |
| 21 | <select id="cb_comp" class="nj-skinned" /> | 21 | <select data-montage-id="cb_comp" class="nj-skinned" /> |
| 22 | </body> | 22 | </body> |
| 23 | </html> \ No newline at end of file | 23 | </html> \ No newline at end of file |
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/hottext.reel/hottext.html b/js/components/hottext.reel/hottext.html index 314d4ca3..c759354e 100755 --- a/js/components/hottext.reel/hottext.html +++ b/js/components/hottext.reel/hottext.html | |||
| @@ -23,6 +23,6 @@ | |||
| 23 | 23 | ||
| 24 | </head> | 24 | </head> |
| 25 | <body> | 25 | <body> |
| 26 | <input id="hottext"/> | 26 | <input data-montage-id="hottext" class="hottext"/> |
| 27 | </body> | 27 | </body> |
| 28 | </html> \ No newline at end of file | 28 | </html> \ No newline at end of file |
diff --git a/js/components/hottextunit.reel/hottextunit.html b/js/components/hottextunit.reel/hottextunit.html index 3f946f9b..ec10f975 100755 --- a/js/components/hottextunit.reel/hottextunit.html +++ b/js/components/hottextunit.reel/hottextunit.html | |||
| @@ -22,6 +22,6 @@ | |||
| 22 | 22 | ||
| 23 | </head> | 23 | </head> |
| 24 | <body> | 24 | <body> |
| 25 | <div id="hottextunit" class="hottextunit"></div> | 25 | <div data-montage-id="hottextunit" class="hottextunit"></div> |
| 26 | </body> | 26 | </body> |
| 27 | </html> \ No newline at end of file | 27 | </html> \ No newline at end of file |
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 7e14157e..ae3e2022 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
| @@ -78,11 +78,11 @@ | |||
| 78 | </head> | 78 | </head> |
| 79 | <body> | 79 | <body> |
| 80 | 80 | ||
| 81 | <secti | ||