diff options
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/presets/default-animation-presets.js | 48 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 13 |
2 files changed, 61 insertions, 0 deletions
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js index 2e656e86..0730c2ef 100644 --- a/js/panels/presets/default-animation-presets.js +++ b/js/panels/presets/default-animation-presets.js | |||
@@ -38,6 +38,54 @@ exports.animationPresets = { | |||
38 | }] | 38 | }] |
39 | }, { | 39 | }, { |
40 | "text": "3D Animations", | 40 | "text": "3D Animations", |
41 | "children": [ | ||
42 | { | ||
43 | "text": "Slide Out with Fade", | ||
44 | "selectorBase": "slide-fade-out", | ||
45 | "rules" : [{ | ||
46 | "selectorSuffix" : "", | ||
47 | "styles" : { | ||
48 | "-webkit-animation-name": "slide-fade-out", | ||
49 | "-webkit-animation-duration": "5s", | ||
50 | "-webkit-animation-iteration-count": "infinite", | ||
51 | "-webkit-animation-direction": "normal", | ||
52 | "-webkit-animation-timing-function": "ease", | ||
53 | "-webkit-transform-style": "preserve-3d", | ||
54 | "-webkit-transform": "perspective(1000)", | ||
55 | "-webkit-animation-delay": "0s" | ||
56 | } | ||
57 | },{ | ||
58 | "isKeyFrameRule": true, | ||
59 | "keys" : [{ | ||
60 | "keyText": "0%", | ||
61 | "styles": { | ||
62 | "opacity": "0", | ||
63 | "-webkit-transform": "translate3d(0, 0, 0)" | ||
64 | } | ||
65 | }, { | ||
66 | "keyText": "10%", | ||
67 | "styles": { | ||
68 | "opacity": "1", | ||
69 | "-webkit-transform": "translate3d(0, 0, 0)" | ||
70 | } | ||
71 | }, { | ||
72 | "keyText": "86%", | ||
73 | "styles": { | ||
74 | "opacity": "1", | ||
75 | "-webkit-transform": "translate3d(0, 0, 0)" | ||
76 | |||
77 | } | ||
78 | }, { | ||
79 | "keyText": "100%", | ||
80 | "styles": { | ||
81 | "opacity": "0", | ||
82 | "-webkit-transform": "translate3d(540px, 0, 0)" | ||
83 | } | ||
84 | }] | ||
85 | }] | ||
86 | }] | ||
87 | }, { | ||
88 | "text": "3D Animations", | ||
41 | "children": [ | 89 | "children": [ |
42 | { | 90 | { |
43 | "text": "Rotater", | 91 | "text": "Rotater", |
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 703ef950..ac316907 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
@@ -328,6 +328,19 @@ exports.CustomSection = Montage.create(Component, { | |||
328 | if (aField.value) obj.label = aField.value; | 328 | if (aField.value) obj.label = aField.value; |
329 | if (aField.prop) obj.prop = aField.prop; | 329 | if (aField.prop) obj.prop = aField.prop; |
330 | 330 | ||
331 | if (aField.enabled) { | ||
332 | if(aField.enabled.boundObject) { | ||
333 | // TODO - For now, always bind to this.controls[someProperty] | ||
334 | Object.defineBinding(obj, "enabled", { | ||
335 | boundObject: this.controls, | ||
336 | boundObjectPropertyPath: aField.enabled.boundProperty, | ||
337 | oneway: false | ||
338 | }); | ||
339 | } else { | ||
340 | obj.enabled = aField.enabled; | ||
341 | } | ||
342 | } | ||
343 | |||
331 | //Initiate onChange Events | 344 | //Initiate onChange Events |
332 | obj.addEventListener("change", this, false); | 345 | obj.addEventListener("change", this, false); |
333 | 346 | ||