diff options
author | Eric Guzman | 2012-03-19 11:52:35 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-19 11:52:35 -0700 |
commit | dde5b5054f93db493e5d4d502e677f5781334b08 (patch) | |
tree | 4960525a5b183f0e966462c566817331bea0f3cd /js/panels/presets | |
parent | f08e3660384ed6ed2ba8ecf959c90fd1ade818eb (diff) | |
parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
download | ninja-dde5b5054f93db493e5d4d502e677f5781334b08.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/presets')
5 files changed, 240 insertions, 3 deletions
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.css b/js/panels/presets/animations-presets.reel/animations-presets.css new file mode 100644 index 00000000..0441c1cf --- /dev/null +++ b/js/panels/presets/animations-presets.reel/animations-presets.css | |||
@@ -0,0 +1,5 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ \ No newline at end of file | ||
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html new file mode 100644 index 00000000..c9d752af --- /dev/null +++ b/js/panels/presets/animations-presets.reel/animations-presets.html | |||
@@ -0,0 +1,59 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- <copyright> | ||
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/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html lang="en"> | ||
8 | <head> | ||
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
10 | <link rel="stylesheet" href="animations-presets.css" type="text/css"> | ||
11 | <script type="text/montage-serialization"> | ||
12 | { | ||
13 | "owner": { | ||
14 | "module" : "js/panels/presets/animations-presets.reel", | ||
15 | "name" : "AnimationsLibrary", | ||
16 | "properties" : { | ||
17 | "element" : {"#" : "animationsLibrary"}, | ||
18 | "treeList" : {"@" : "treeList"} | ||
19 | } | ||
20 | }, | ||
21 | "presetsController" : { | ||
22 | "module": "js/controllers/tree-controller", | ||
23 | "name": "TreeController", | ||
24 | "properties" : { | ||
25 | "branchKey" : "children", | ||
26 | "labelKey" : "text", | ||
27 | "delegate": {"@": "owner" } | ||
28 | }, | ||
29 | "bindings": { | ||
30 | "content": { | ||
31 | "boundObject": {"@": "owner"}, | ||
32 | "boundObjectPropertyPath": "presetData" | ||
33 | } | ||
34 | } | ||
35 | }, | ||
36 | "presetsContainer" : { | ||
37 | "module" : "js/components/treeview/treeview.reel", | ||
38 | "name" : "Treeview", | ||
39 | "properties" : { | ||
40 | "element" : {"#": "libraryContainer"}, | ||
41 | "branchComponent" : {"@": "branch" }, | ||
42 | "contentController": {"@": "presetsController"}, | ||
43 | "activationEvent" : "dblclick", | ||
44 | "showRoot": false | ||
45 | } | ||
46 | }, | ||
47 | "branch" : { | ||
48 | "module" : "js/components/treeview/ninja-branch.reel", | ||
49 | "name" : "Branch" | ||
50 | } | ||
51 | } | ||
52 | </script> | ||
53 | </head> | ||
54 | <body> | ||
55 | <section id="animationsLibrary" class="animationsLibrary"> | ||
56 | <div id="libraryContainer"></div> | ||
57 | </section> | ||
58 | </body> | ||
59 | </html> \ No newline at end of file | ||
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js new file mode 100644 index 00000000..ab200212 --- /dev/null +++ b/js/panels/presets/animations-presets.reel/animations-presets.js | |||
@@ -0,0 +1,73 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | var Montage = require("montage/core/core").Montage, | ||
8 | Component = require("montage/ui/component").Component, | ||
9 | DefaultPresets = require("js/panels/presets/default-animation-presets").animationPresets; | ||
10 | |||
11 | exports.AnimationsLibrary = Montage.create(Component, { | ||
12 | hasTemplate: { | ||
13 | value: true | ||
14 | }, | ||
15 | presetData : { | ||
16 | value: null | ||
17 | }, | ||
18 | deserializedFromTemplate : { | ||
19 | value: function() { | ||
20 | this.presetData = DefaultPresets; | ||
21 | } | ||
22 | }, | ||
23 | handleNodeActivation: { | ||
24 | value: function(presetData) { | ||
25 | //debugger; | ||
26 | var selection = this.application.ninja.selectedElements, | ||
27 | stylesController = this.application.ninja.stylesController, | ||
28 | selectorBase = presetData.selectorBase, | ||
29 | self = this; | ||
30 | |||
31 | if(!selection || !selection.length || selection.length === 0) { | ||
32 | return false; | ||
33 | } | ||
34 | |||
35 | selectorBase = stylesController.generateClassName(selectorBase); | ||
36 | |||
37 | presetData.rules.forEach(function(rule) { | ||
38 | if(rule.isKeyFrameRule) { | ||
39 | this.application.ninja.stylesController.addRule( | ||
40 | '@-webkit-keyframes ' + presetData.selectorBase, | ||
41 | this.stringifyKeys(rule.keys) | ||
42 | ); | ||
43 | } else { | ||
44 | this.application.ninja.stylesController.addRule('.' + selectorBase + rule.selectorSuffix, rule.styles); | ||
45 | } | ||
46 | |||
47 | }, this); | ||
48 | |||
49 | selection.forEach(function(el) { | ||
50 | el._element.classList.add(selectorBase); | ||
51 | }, this); | ||
52 | |||
53 | } | ||
54 | }, | ||
55 | |||
56 | stringifyKeys : { | ||
57 | value: function(keysArray) { | ||
58 | var keysString = ''; | ||
59 | |||
60 | keysArray.forEach(function(key) { | ||
61 | var styles = '', style; | ||
62 | |||
63 | for(style in key.styles) { | ||
64 | styles += style + ':' + key.styles[style] + '; '; | ||
65 | } | ||
66 | |||
67 | keysString += key.keyText + ' {' + styles + ' }'; | ||
68 | }); | ||
69 | |||
70 | return keysString; | ||
71 | } | ||
72 | } | ||
73 | }); | ||
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html index 38de2a6d..f01e6435 100644 --- a/js/panels/presets/content.reel/content.html +++ b/js/panels/presets/content.reel/content.html | |||
@@ -19,7 +19,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
19 | "tabBar" : {"#": "tab-bar" }, | 19 | "tabBar" : {"#": "tab-bar" }, |
20 | "tabs" : [ | 20 | "tabs" : [ |
21 | {"key":"styles", "tab": {"#": "styles" }}, | 21 | {"key":"styles", "tab": {"#": "styles" }}, |
22 | {"key":"transitions", "tab": {"#": "transitions" }} | 22 | {"key":"transitions", "tab": {"#": "transitions" }}, |
23 | {"key":"animations", "tab": {"#": "animations" }} | ||
23 | ] | 24 | ] |
24 | } | 25 | } |
25 | }, | 26 | }, |
@@ -30,8 +31,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
30 | "element": {"#": "librarySlot"}, | 31 | "element": {"#": "librarySlot"}, |
31 | "switchComponents": { | 32 | "switchComponents": { |
32 | "styles": {"@": "stylesLibrary"}, | 33 | "styles": {"@": "stylesLibrary"}, |
33 | "transitions": {"@": "transitionsLibrary"} | 34 | "transitions": {"@": "transitionsLibrary"}, |
34 | 35 | "animations": {"@": "animationsLibrary"} | |
35 | } | 36 | } |
36 | }, | 37 | }, |
37 | "bindings": { | 38 | "bindings": { |
@@ -49,6 +50,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
49 | "transitionsLibrary": { | 50 | "transitionsLibrary": { |
50 | "module": "js/panels/presets/transitions-presets.reel", | 51 | "module": "js/panels/presets/transitions-presets.reel", |
51 | "name": "TransitionsLibrary" | 52 | "name": "TransitionsLibrary" |
53 | }, | ||
54 | "animationsLibrary": { | ||
55 | "module": "js/panels/presets/animations-presets.reel", | ||
56 | "name": "AnimationsLibrary" | ||
52 | } | 57 | } |
53 | 58 | ||
54 | } | 59 | } |
@@ -59,6 +64,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
59 | <nav id="tab-bar" class="tab-bar"> | 64 | <nav id="tab-bar" class="tab-bar"> |
60 | <div id="styles">Style Library</div> | 65 | <div id="styles">Style Library</div> |
61 | <div id="transitions">Transitions Library</div> | 66 | <div id="transitions">Transitions Library</div> |
67 | <div id="animations">Animations Library</div> | ||
62 | </nav> | 68 | </nav> |
63 | <div id="librarySlot" class="librarySlot"></div> | 69 | <div id="librarySlot" class="librarySlot"></div> |
64 | </section> | 70 | </section> |
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js new file mode 100644 index 00000000..10a3e906 --- /dev/null +++ b/js/panels/presets/default-animation-presets.js | |||
@@ -0,0 +1,94 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 |