diff options
| author | Eric Guzman | 2012-04-30 13:48:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-30 13:48:43 -0700 |
| commit | 23d8efd4ed9e8fd43f516595009679fb44c8096d (patch) | |
| tree | 7d5be06e6417102702a49ece24fca82528aced7a /js/panels/presets/transitions-presets.reel | |
| parent | ae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/presets/transitions-presets.reel')
| -rw-r--r-- | js/panels/presets/transitions-presets.reel/transitions-presets.html | 14 |
1 files changed, 5 insertions, 9 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..2f084463 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,14 @@ 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"} | 17 | "treeList" : {"@" : "treeList"} |
| 19 | } | 18 | } |
| 20 | }, | 19 | }, |
| 21 | "presetsController" : { | 20 | "presetsController" : { |
| 22 | "module": "js/controllers/tree-controller", | 21 | "prototype": "js/controllers/tree-controller", |
| 23 | "name": "TreeController", | ||
| 24 | "properties" : { | 22 | "properties" : { |
| 25 | "branchKey" : "children", | 23 | "branchKey" : "children", |
| 26 | "labelKey" : "text", | 24 | "labelKey" : "text", |
| @@ -34,8 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 34 | } | 32 | } |
| 35 | }, | 33 | }, |
| 36 | "presetsContainer" : { | 34 | "presetsContainer" : { |
| 37 | "module" : "js/components/treeview/treeview.reel", | 35 | "prototype" : "js/components/treeview/treeview.reel", |
| 38 | "name" : "Treeview", | ||
| 39 | "properties" : { | 36 | "properties" : { |
| 40 | "element" : {"#": "libraryContainer"}, | 37 | "element" : {"#": "libraryContainer"}, |
| 41 | "branchComponent" : {"@": "branch" }, | 38 | "branchComponent" : {"@": "branch" }, |
| @@ -45,8 +42,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 45 | } | 42 | } |
| 46 | }, | 43 | }, |
| 47 | "branch" : { | 44 | "branch" : { |
| 48 | "module" : "js/components/treeview/ninja-branch.reel", | 45 | "prototype" : "js/components/treeview/ninja-branch.reel[Branch]" |
| 49 | "name" : "Branch" | ||
| 50 | } | 46 | } |
| 51 | } | 47 | } |
| 52 | </script> | 48 | </script> |