diff options
| author | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
| commit | e377a8dc0b0e34905782ed867acb5fe725ae0131 (patch) | |
| tree | 6931311aabd7a4e366df195a168d437f1d0d8465 /js | |
| parent | 8be6e94b57f4bd6e28754a6113b4d6a401365e13 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-e377a8dc0b0e34905782ed867acb5fe725ae0131.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js')
105 files changed, 588 insertions, 728 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- |