diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components')
63 files changed, 428 insertions, 616 deletions
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html index 7142d605..ecdd4389 100644 --- a/js/components/about-box.reel/about-box.html +++ b/js/components/about-box.reel/about-box.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -12,8 +12,7 @@ | |||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "owner": { | 14 | "owner": { |
| 15 | "module": "js/components/about-box.reel", | 15 | "prototype": "js/components/about-box.reel", |
| 16 | "name": "AboutBox", | ||
| 17 | "properties": { | 16 | "properties": { |
| 18 | "element": {"#": "mainAboutBoxContainer"} | 17 | "element": {"#": "mainAboutBoxContainer"} |
| 19 | } | 18 | } |
| @@ -22,7 +21,7 @@ | |||
| 22 | </script> | 21 | </script> |
| 23 | </head> | 22 | </head> |
| 24 | <body> | 23 | <body> |
| 25 | <div class="mainAboutBoxContainer" id="mainAboutBoxContainer"> | 24 | <div data-montage-id="mainAboutBoxContainer" class="mainAboutBoxContainer"> |
| 26 | <div id="about_box_ninja_logo"></div> | 25 | <div id="about_box_ninja_logo"></div> |
| 27 | <div id="aboutBoxTextBlock" class="baseAboutBoxText"> | 26 | <div id="aboutBoxTextBlock" class="baseAboutBoxText"> |
| 28 | <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 3d523a98..ded91fc2 100755 --- a/js/components/checkbox.reel/checkbox.html +++ b/js/components/checkbox.reel/checkbox.html | |||
| @@ -9,8 +9,7 @@ | |||
| 9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
| 10 | { | 10 | { |
| 11 | "owner": { | 11 | "owner": { |
| 12 | "module": "js/components/checkbox.reel", | 12 | "prototype": "js/components/checkbox.reel", |
| 13 | "name": "Checkbox", | ||
| 14 | "properties": { | 13 | "properties": { |
| 15 | "element": {"#": "ch_comp"} | 14 | "element": {"#": "ch_comp"} |
| 16 | } | 15 | } |
| @@ -19,6 +18,6 @@ | |||
| 19 | </script> | 18 | </script> |
| 20 | </head> | 19 | </head> |
| 21 | <body> | 20 | <body> |
| 22 | <input id="ch_comp" class="nj-skinned" type="checkbox"> | 21 | <input data-montage-id="ch_comp" class="nj-skinned" type="checkbox"> |
| 23 | </body> | 22 | </body> |
| 24 | </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 f74f1437..2e189c87 100755 --- a/js/components/colorbar.reel/colorbar.html +++ b/js/components/colorbar.reel/colorbar.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- | 2 | <!-- |
| 3 | <copyright> | 3 | <copyright> |
| 4 | This file contains proprietary software owned by Motorola Mobility, Inc. | 4 | This file contains proprietary software owned by Motorola Mobility, Inc. |
| @@ -16,8 +16,7 @@ | |||
| 16 | <script type="text/montage-serialization"> | 16 | <script type="text/montage-serialization"> |
| 17 | { | 17 | { |
| 18 | "owner": { | 18 | "owner": { |
| 19 | "module": "js/components/colorbar.reel", | 19 | "prototype": "js/components/colorbar.reel[ColorBar]", |
| 20 | "name": "ColorBar", | ||
| 21 | "properties": { | 20 | "properties": { |
| 22 | "element": {"#": "colorbar"} | 21 | "element": {"#": "colorbar"} |
| 23 | 22 | ||
| @@ -30,7 +29,7 @@ | |||
| 30 | 29 | ||
| 31 | <body> | 30 | <body> |
| 32 | 31 | ||
| 33 | <canvas id="colorbar" class="colorbar"></canvas> | 32 | <canvas data-montage-id="colorbar" class="colorbar"></canvas> |
| 34 | 33 | ||
| 35 | </body> | 34 | </body> |
| 36 | 35 | ||
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index a9fbfbd9..707bd637 100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- | 2 | <!-- |
| 3 | <copyright> | 3 | <copyright> |
| 4 | This file contains proprietary software owned by Motorola Mobility, Inc. | 4 | This file contains proprietary software owned by Motorola Mobility, Inc. |
| @@ -16,8 +16,7 @@ | |||
| 16 | <script type="text/montage-serialization"> | 16 | <script type="text/montage-serialization"> |
| 17 | { | 17 | { |
| 18 | "owner": { | 18 | "owner": { |
| 19 | "module": "js/components/colorwheel.reel", | 19 | "prototype": "js/components/colorwheel.reel[ColorWheel]", |
| 20 | "name": "ColorWheel", | ||
| 21 | "properties": { | ||