aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-27 14:29:01 -0700
committerJose Antonio Marquez2012-04-27 14:29:01 -0700
commit7fdeb9feac4d2da9f86646cda4548ea60e5effa9 (patch)
tree6b43b7b2375fad6804ae88287906e3b77b4539b9 /js/panels/presets
parentd988dead643ff4f9bfa417286a6b5f88be0e7c82 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-7fdeb9feac4d2da9f86646cda4548ea60e5effa9.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels/presets')
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.html14
-rw-r--r--js/panels/presets/content.reel/content.html17
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html14
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html14
4 files changed, 21 insertions, 38 deletions
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html
index c9d752af..d333cf97 100644
--- a/js/panels/presets/animations-presets.reel/animations-presets.html
+++ b/js/panels/presets/animations-presets.reel/animations-presets.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4No 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/animations-presets.reel", 14 "prototype" : "js/panels/presets/animations-presets.reel[AnimationsLibrary]",
15 "name" : "AnimationsLibrary",
16 "properties" : { 15 "properties" : {
17 "element" : {"#" : "animationsLibrary"}, 16 "element" : {"#" : "animationsLibrary"},
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>
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>
3This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4No 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 }
diff --git a/js/panels/presets/style-presets.reel/style-presets.html b/js/panels/presets/style-presets.reel/style-presets.html
index 0db4d3c0..7490a73b 100644
--- a/js/panels/presets/style-presets.reel/style-presets.html
+++ b/js/panels/presets/style-presets.reel/style-presets.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4No 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/style-presets.reel", 14 "prototype" : "js/panels/presets/style-presets.reel[StylesLibrary]",
15 "name" : "StylesLibrary",
16 "properties" : { 15 "properties" : {
17 "element" : {"#" : "stylesLibrary"}, 16 "element" : {"#" : "stylesLibrary"},
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>
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>
3This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4No 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" : {