diff options
| author | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
| commit | c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch) | |
| tree | 74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/panels/presets/content.reel/content.html | |
| parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/presets/content.reel/content.html')
| -rw-r--r-- | js/panels/presets/content.reel/content.html | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html index afbdd559..27928670 100644 --- a/js/panels/presets/content.reel/content.html +++ b/js/panels/presets/content.reel/content.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,8 +11,7 @@ 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/content.reel", | 14 | "prototype" : "js/panels/presets/content.reel", |
| 15 | "name" : "Content", | ||
| 16 | "properties" : { | 15 | "properties" : { |
| 17 | "element" : {"#" : "presetsPanel"}, | 16 | "element" : {"#" : "presetsPanel"}, |
| 18 | "activeTabIndex": 0, | 17 | "activeTabIndex": 0, |
| @@ -25,8 +24,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 25 | } | 24 | } |
| 26 | }, | 25 | }, |
| 27 | "substitution": { | 26 | "substitution": { |
| 28 | "module": "montage/ui/substitution.reel", | 27 | "prototype": "montage/ui/substitution.reel", |
| 29 | "name": "Substitution", | ||
| 30 | "properties": { | 28 | "properties": { |
| 31 | "element": {"#": "librarySlot"}, | 29 | "element": {"#": "librarySlot"}, |
| 32 | "switchComponents": { | 30 | "switchComponents": { |
| @@ -44,16 +42,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 44 | } | 42 | } |
| 45 | }, | 43 | }, |
| 46 | "stylesLibrary": { | 44 | "stylesLibrary": { |
| 47 | "module": "js/panels/presets/style-presets.reel", | 45 | "prototype": "js/panels/presets/style-presets.reel[StylesLibrary]" |
| 48 | "name": "StylesLibrary" | ||
| 49 | }, | 46 | }, |
| 50 | "transitionsLibrary": { | 47 | "transitionsLibrary": { |
| 51 | "module": "js/panels/presets/transitions-presets.reel", | 48 | "prototype": "js/panels/presets/transitions-presets.reel[TransitionsLibrary]" |
| 52 | "name": "TransitionsLibrary" | ||
| 53 | }, | 49 | }, |
| 54 | "animationsLibrary": { | 50 | "animationsLibrary": { |
| 55 | "module": "js/panels/presets/animations-presets.reel", | 51 | "prototype": "js/panels/presets/animations-presets.reel[AnimationsLibrary]" |
| 56 | "name": "AnimationsLibrary" | ||
| 57 | } | 52 | } |
| 58 | 53 | ||
| 59 | } | 54 | } |