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/panels/presets/transitions-presets.reel | |
| 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/panels/presets/transitions-presets.reel')
| -rw-r--r-- | js/panels/presets/transitions-presets.reel/transitions-presets.html | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html index 5dc28edf..add43ee7 100644 --- a/js/panels/presets/transitions-presets.reel/transitions-presets.html +++ b/js/panels/presets/transitions-presets.reel/transitions-presets.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/> |
| @@ -11,16 +11,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| 14 | "module" : "js/panels/presets/transitions-presets.reel", | 14 | "prototype" : "js/panels/presets/transitions-presets.reel[TransitionsLibrary]", |
| 15 | "name" : "TransitionsLibrary", | ||
| 16 | "properties" : { | 15 | "properties" : { |
| 17 | "element" : {"#" : "transitionsLibrary"}, | 16 | "element" : {"#" : "transitionsLibrary"} |
| 18 | "treeList" : {"@" : "treeList"} | ||
| 19 | } | 17 | } |
| 20 | }, | 18 | }, |
| 21 | "presetsController" : { | 19 | "presetsController" : { |
| 22 | "module": "js/controllers/tree-controller", | 20 | "prototype": "js/components/controllers/tree-controller", |
| 23 | "name": "TreeController", | ||
| 24 | "properties" : { | 21 | "properties" : { |
| 25 | "branchKey" : "children", | 22 | "branchKey" : "children", |
| 26 | "labelKey" : "text", | 23 | "labelKey" : "text", |
| @@ -34,8 +31,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 34 | } | 31 | } |
| 35 | }, | 32 | }, |
| 36 | "presetsContainer" : { | 33 | "presetsContainer" : { |
| 37 | "module" : "js/components/treeview/treeview.reel", | 34 | "prototype" : "js/components/treeview/treeview.reel", |
| 38 | "name" : "Treeview", | ||
| 39 | "properties" : { | 35 | "properties" : { |
| 40 | "element" : {"#": "libraryContainer"}, | 36 | "element" : {"#": "libraryContainer"}, |
| 41 | "branchComponent" : {"@": "branch" }, | 37 | "branchComponent" : {"@": "branch" }, |
| @@ -45,15 +41,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 45 | } | 41 | } |
| 46 | }, | 42 | }, |
| 47 | "branch" : { | 43 | "branch" : { |
| 48 | "module" : "js/components/treeview/ninja-branch.reel", | 44 | "prototype" : "js/components/treeview/ninja-branch.reel[Branch]" |
| 49 | "name" : "Branch" | ||
| 50 | } | 45 | } |
| 51 | } | 46 | } |
| 52 | </script> | 47 | </script> |
| 53 | </head> | 48 | </head> |
| 54 | <body> | 49 | <body> |
| 55 | <section id="transitionsLibrary" class="transitionsLibrary"> | 50 | <section data-montage-id="transitionsLibrary" class="transitionsLibrary"> |
| 56 | <div id="libraryContainer"></div> | 51 | <div data-montage-id="libraryContainer"></div> |
| 57 | </section> | 52 | </section> |
| 58 | </body> | 53 | </body> |
| 59 | </html> \ No newline at end of file | 54 | </html> \ No newline at end of file |