diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/presets/animations-presets.reel | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/panels/presets/animations-presets.reel')
| -rw-r--r-- | js/panels/presets/animations-presets.reel/animations-presets.html | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html index d333cf97..2b5a33d6 100644 --- a/js/panels/presets/animations-presets.reel/animations-presets.html +++ b/js/panels/presets/animations-presets.reel/animations-presets.html | |||
| @@ -13,12 +13,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 13 | "owner": { | 13 | "owner": { |
| 14 | "prototype" : "js/panels/presets/animations-presets.reel[AnimationsLibrary]", | 14 | "prototype" : "js/panels/presets/animations-presets.reel[AnimationsLibrary]", |
| 15 | "properties" : { | 15 | "properties" : { |
| 16 | "element" : {"#" : "animationsLibrary"}, | 16 | "element" : {"#" : "animationsLibrary"} |
| 17 | "treeList" : {"@" : "treeList"} | ||
| 18 | } | 17 | } |
| 19 | }, | 18 | }, |
| 20 | "presetsController" : { | 19 | "presetsController" : { |
| 21 | "prototype": "js/controllers/tree-controller", | 20 | "prototype": "js/components/controllers/tree-controller", |
| 22 | "properties" : { | 21 | "properties" : { |
| 23 | "branchKey" : "children", | 22 | "branchKey" : "children", |
| 24 | "labelKey" : "text", | 23 | "labelKey" : "text", |
| @@ -48,8 +47,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 48 | </script> | 47 | </script> |
| 49 | </head> | 48 | </head> |
| 50 | <body> | 49 | <body> |
| 51 | <section id="animationsLibrary" class="animationsLibrary"> | 50 | <section data-montage-id="animationsLibrary" class="animationsLibrary"> |
| 52 | <div id="libraryContainer"></div> | 51 | <div data-montage-id="libraryContainer"></div> |
| 53 | </section> | 52 | </section> |
| 54 | </body> | 53 | </body> |
| 55 | </html> \ No newline at end of file | 54 | </html> \ No newline at end of file |