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 | |
parent | ae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/presets')
5 files changed, 30 insertions, 50 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> |
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/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> |
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 | } |
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js index 578c1622..753b3365 100644 --- a/js/panels/presets/default-animation-presets.js +++ b/js/panels/presets/default-animation-presets.js | |||
@@ -52,7 +52,6 @@ exports.animationPresets = { | |||
52 | "-webkit-animation-direction": "normal", | 52 | "-webkit-animation-direction": "normal", |
53 | "-webkit-animation-timing-function": "ease", | 53 | "-webkit-animation-timing-function": "ease", |
54 | "-webkit-transform-style": "preserve-3d", | 54 | "-webkit-transform-style": "preserve-3d", |
55 | "-webkit-transform": "perspective(1000)", | ||
56 | "-webkit-animation-delay": "0s" | 55 | "-webkit-animation-delay": "0s" |
57 | } | 56 | } |
58 | },{ | 57 | },{ |
@@ -100,7 +99,6 @@ exports.animationPresets = { | |||
100 | "-webkit-animation-timing-function": "ease-out", | 99 | "-webkit-animation-timing-function": "ease-out", |
101 | "-webkit-transform-origin": "100% 50%", | 100 | "-webkit-transform-origin": "100% 50%", |
102 | "-webkit-transform-style": "preserve-3d", | 101 | "-webkit-transform-style": "preserve-3d", |
103 | "-webkit-transform": "perspective(1000)", | ||
104 | "-webkit-animation-delay": "0s" | 102 | "-webkit-animation-delay": "0s" |
105 | } | 103 | } |
106 | },{ | 104 | },{ |
@@ -109,31 +107,31 @@ exports.animationPresets = { | |||
109 | "keyText": "0%", | 107 | "keyText": "0%", |
110 | "styles": { | 108 | "styles": { |
111 | "opacity": "1", | 109 | "opacity": "1", |
112 | "-webkit-transform": "perspective(1000) rotateY(0deg)" | 110 | "-webkit-transform": "rotateY(0deg)" |
113 | } | 111 | } |
114 | }, { | 112 | }, { |
115 | "keyText": "70%", | 113 | "keyText": "70%", |
116 | "styles": { | 114 | "styles": { |
117 | "opacity": "1", | 115 | "opacity": "1", |
118 | "-webkit-transform": "perspective(1000) rotateY(0deg)" | 116 | "-webkit-transform": "rotateY(0deg)" |
119 | } | 117 | } |
120 | }, { | 118 | }, { |
121 | "keyText": "85%", | 119 | "keyText": "85%", |
122 | "styles": { | 120 | "styles": { |
123 | "opacity": "0", | 121 | "opacity": "0", |
124 | "-webkit-transform": "perspective(1000) rotateY(95deg)" | 122 | "-webkit-transform": "rotateY(95deg)" |
125 | } | 123 | } |
126 | }, { | 124 | }, { |
127 | "keyText": "86%", | 125 | "keyText": "86%", |
128 | "styles": { | 126 | "styles": { |
129 | "opacity": "0", | 127 | "opacity": "0", |
130 | "-webkit-transform": "perspective(1000) rotateY(-90deg)" | 128 | "-webkit-transform": "rotateY(-90deg)" |
131 | } | 129 | } |
132 | }, { | 130 | }, { |
133 | "keyText": "100%", | 131 | "keyText": "100%", |
134 | "styles": { | 132 | "styles": { |
135 | "opacity": "1", | 133 | "opacity": "1", |
136 | "-webkit-transform": "perspective(1000) rotateY(0deg)" | 134 | "-webkit-transform": "rotateY(0deg)" |
137 | } | 135 | } |
138 | }] | 136 | }] |
139 | }] | 137 | }] |
@@ -151,7 +149,6 @@ exports.animationPresets = { | |||
151 | "-webkit-animation-timing-function": "ease-out", | 149 | "-webkit-animation-timing-function": "ease-out", |
152 | "-webkit-transform-origin": "100% 50%", | 150 | "-webkit-transform-origin": "100% 50%", |
153 | "-webkit-transform-style": "preserve-3d", | 151 | "-webkit-transform-style": "preserve-3d", |
154 | "-webkit-transform": "perspective(1000)", | ||
155 | "-webkit-animation-delay": "0s" | 152 | "-webkit-animation-delay": "0s" |
156 | } | 153 | } |
157 | },{ | 154 | },{ |
@@ -160,25 +157,25 @@ exports.anima |