diff options
author | Jose Antonio Marquez | 2012-03-28 13:58:31 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-28 13:58:31 -0700 |
commit | 02bb0b7d1f0b9d5a4e1c85315f026c437b2808f3 (patch) | |
tree | 88c96e3f87729a873af7fc88379f4935e83306ed /js/panels | |
parent | 67d5f237cafd738892cdda51e5742afb0534149b (diff) | |
parent | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff) | |
download | ninja-02bb0b7d1f0b9d5a4e1c85315f026c437b2808f3.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/Splitter.js | 2 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 4 | ||||
-rw-r--r-- | js/panels/presets/animations-presets.reel/animations-presets.js | 47 | ||||
-rw-r--r-- | js/panels/presets/default-animation-presets.js | 2 | ||||
-rw-r--r-- | js/panels/presets/default-style-presets.js | 11 | ||||
-rw-r--r-- | js/panels/presets/default-transition-presets.js | 8 | ||||
-rw-r--r-- | js/panels/presets/style-presets.reel/style-presets.js | 49 | ||||
-rw-r--r-- | js/panels/presets/transitions-presets.reel/transitions-presets.js | 20 | ||||
-rw-r--r-- | js/panels/resize-composer.js | 34 |
9 files changed, 39 insertions, 138 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js index e92cb2dd..6791e0d5 100755 --- a/js/panels/Splitter.js +++ b/js/panels/Splitter.js | |||
@@ -55,7 +55,7 @@ exports.Splitter = Montage.create(Component, { | |||
55 | }, | 55 | }, |
56 | set: function(value) { | 56 | set: function(value) { |
57 | this._collapsed = value; | 57 | this._collapsed = value; |
58 | 58 | this.needsDraw = true; | |
59 | this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); | 59 | this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); |
60 | } | 60 | } |
61 | }, | 61 | }, |
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css index 129b9771..067285ae 100644 --- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css +++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | |||
@@ -10,12 +10,12 @@ | |||
10 | height: 100%; | 10 | height: 100%; |
11 | } | 11 | } |
12 | .maintimeline{ | 12 | .maintimeline{ |
13 | border-style: double; | ||
14 | -webkit-box-flex: 1; | 13 | -webkit-box-flex: 1; |
15 | display: -webkit-box; | 14 | display: -webkit-box; |
16 | -webkit-box-orient: horizontal | 15 | -webkit-box-orient: horizontal; |
17 | height : 100%; | 16 | height : 100%; |
18 | position: relative; | 17 | position: relative; |
18 | margin-top:1px; | ||
19 | } | 19 | } |
20 | .leftinside{ | 20 | .leftinside{ |
21 | height: 100%; | 21 | height: 100%; |
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js index ab200212..6a16da54 100644 --- a/js/panels/presets/animations-presets.reel/animations-presets.js +++ b/js/panels/presets/animations-presets.reel/animations-presets.js | |||
@@ -22,52 +22,7 @@ exports.AnimationsLibrary = Montage.create(Component, { | |||
22 | }, | 22 | }, |
23 | handleNodeActivation: { | 23 | handleNodeActivation: { |
24 | value: function(presetData) { | 24 | value: function(presetData) { |
25 | //debugger; | 25 | this.application.ninja.presetsController.applyPreset(presetData); |
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 | } | 26 | } |
72 | } | 27 | } |
73 | }); | 28 | }); |
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js index 64f91ea6..b12a94b2 100644 --- a/js/panels/presets/default-animation-presets.js +++ b/js/panels/presets/default-animation-presets.js | |||
@@ -13,7 +13,6 @@ exports.animationPresets = { | |||
13 | "text": "Border Morph", | 13 | "text": "Border Morph", |
14 | "selectorBase" : "border-morph", | 14 | "selectorBase" : "border-morph", |
15 | "rules" : [{ | 15 | "rules" : [{ |
16 | "selectorSuffix" : "", | ||
17 | "styles" : { | 16 | "styles" : { |
18 | "-webkit-animation": "border-morph 2s infinite" | 17 | "-webkit-animation": "border-morph 2s infinite" |
19 | } | 18 | } |
@@ -91,7 +90,6 @@ exports.animationPresets = { | |||
91 | "text": "Rotater", | 90 | "text": "Rotater", |
92 | "selectorBase" : "rotate-with-alpha-keyframes", | 91 | "selectorBase" : "rotate-with-alpha-keyframes", |
93 | "rules" : [{ | 92 | "rules" : [{ |
94 | "selectorSuffix" : "", | ||
95 | "styles" : { | 93 | "styles" : { |
96 | "-webkit-animation-name": "rotate-with-alpha-keyframes", | 94 | "-webkit-animation-name": "rotate-with-alpha-keyframes", |
97 | "-webkit-animation-duration": "5s", | 95 | "-webkit-animation-duration": "5s", |
diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js index 82bec34f..10b24ff4 100644 --- a/js/panels/presets/default-style-presets.js +++ b/js/panels/presets/default-style-presets.js | |||
@@ -11,9 +11,9 @@ exports.stylePresets = { | |||
11 | "children": [ | 11 | "children": [ |
12 | { | 12 | { |
13 | "text": "Border-Radius", | 13 | "text": "Border-Radius", |
14 | "id": "njBorderRadius", | ||
14 | "selectorBase" : "border-radius-preset", | 15 | "selectorBase" : "border-radius-preset", |
15 | "rules" : [{ | 16 | "rules" : [{ |
16 | "selectorSuffix" : "", | ||
17 | "styles" : { | 17 | "styles" : { |
18 | "border-radius": "100px", | 18 | "border-radius": "100px", |
19 | "border" : "1px solid #333" | 19 | "border" : "1px solid #333" |
@@ -22,9 +22,9 @@ exports.stylePresets = { | |||
22 | }, | 22 | }, |
23 | { | 23 | { |
24 | "text": "Drop Shadow", | 24 | "text": "Drop Shadow", |
25 | "id": "njDropShadow", | ||
25 | "selectorBase" : "drop-shadow", | 26 | "selectorBase" : "drop-shadow", |
26 | "rules" : [{ | 27 | "rules" : [{ |
27 | "selectorSuffix" : "", | ||
28 | "styles" : { | 28 | "styles" : { |
29 | "box-shadow": "2px 2px 50px rgba(0,0,0,0.5)", | 29 | "box-shadow": "2px 2px 50px rgba(0,0,0,0.5)", |
30 | "border" : "1px solid #CCC" | 30 | "border" : "1px solid #CCC" |
@@ -33,9 +33,10 @@ exports.stylePresets = { | |||
33 | }, | 33 | }, |
34 | { | 34 | { |
35 | "text": "Fancy Box", | 35 | "text": "Fancy Box", |
36 | "id": "njFancyBox", | ||
36 | "selectorBase" : "fancy-box", | 37 | "selectorBase" : "fancy-box", |
37 | "rules" : [{ | 38 | "rules" : [{ |
38 | "selectorSuffix" : "", | 39 | "selectorSuffix": "", |
39 | "styles" : { | 40 | "styles" : { |
40 | "box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333", | 41 | "box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333", |
41 | "border" : "1px solid #FFF", | 42 | "border" : "1px solid #FFF", |
@@ -50,9 +51,9 @@ exports.stylePresets = { | |||
50 | "children": [ | 51 | "children": [ |
51 | { | 52 | { |
52 | "text": "Italic", | 53 | "text": "Italic", |
54 | "id": "njItalic", | ||
53 | "selectorBase" : "italicize", | 55 | "selectorBase" : "italicize", |
54 | "rules" : [{ | 56 | "rules" : [{ |
55 | "selectorSuffix" : "", | ||
56 | "styles" : { | 57 | "styles" : { |
57 | "font-style": "italic" | 58 | "font-style": "italic" |
58 | } | 59 | } |
@@ -60,9 +61,9 @@ exports.stylePresets = { | |||
60 | }, | 61 | }, |
61 | { | 62 | { |
62 | "text": "Text Shadow", | 63 | "text": "Text Shadow", |
64 | "id": "njTextShadow", | ||
63 | "selectorBase" : "italicize", | 65 | "selectorBase" : "italicize", |
64 | "rules" : [{ | 66 | "rules" : [{ |
65 | "selectorSuffix" : "", | ||
66 | "styles" : { | 67 | "styles" : { |
67 | "text-shadow": "1px 1px 3px #333" | 68 | "text-shadow": "1px 1px 3px #333" |
68 | } | 69 | } |
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js index 15f4882f..f8968085 100644 --- a/js/panels/presets/default-transition-presets.js +++ b/js/panels/presets/default-transition-presets.js | |||
@@ -13,7 +13,6 @@ exports.transitionPresets = { | |||
13 | "text": "Fade In", | 13 | "text": "Fade In", |
14 | "selectorBase" : "fade-in", | 14 | "selectorBase" : "fade-in", |
15 | "rules" : [{ | 15 | "rules" : [{ |