aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/presets
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-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')
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.html21
-rw-r--r--js/panels/presets/content.reel/content.html29
-rw-r--r--js/panels/presets/default-animation-presets.js21
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html21
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html21
5 files changed, 45 insertions, 68 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..2b5a33d6 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,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/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"}
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="animationsLibrary" class="animationsLibrary"> 50<section data-montage-id="animationsLibrary" class="animationsLibrary">
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
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index afbdd559..50a48389 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,29 +42,26 @@ 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 }
60 </script> 55 </script>
61</head> 56</head>
62<body> 57<body>
63 <section id="presetsPanel" class="presetsPanel"> 58 <section data-montage-id="presetsPanel" class="presetsPanel">
64 <nav id="tab-bar" class="tab-bar"> 59 <nav data-montage-id="tab-bar" class="tab-bar">
65 <div id="styles">Styles</div> 60 <div data-montage-id="styles">Styles</div>
66 <div id="transitions">Transitions</div> 61 <div data-montage-id="transitions">Transitions</div>
67 <div id="animations">Animations</div> 62 <div data-montage-id="animations">Animations</div>
68 </nav> 63 </nav>
69 <div id="librarySlot" class="librarySlot"></div> 64 <div data-montage-id="librarySlot" class="librarySlot"></div>
70 </section> 65 </section>
71</body> 66</body>
72</html> \ No newline at end of file 67</html> \ No newline at end of file
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