diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /js/panels/presets/animations-presets.reel/animations-presets.html | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/presets/animations-presets.reel/animations-presets.html')
| -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 |