aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'js/controllers')
-rw-r--r--js/controllers/presets-controller.js77
1 files changed, 51 insertions, 26 deletions
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js
index 0467f73c..975f9f7a 100644
--- a/js/controllers/presets-controller.js
+++ b/js/controllers/presets-controller.js
@@ -20,14 +20,39 @@ exports.PresetsController = Montage.create(Component, {
20 20
21 addTransition: { 21 addTransition: {
22 value: function(element) { 22 value: function(element) {
23 var transitionDuration;
24
23 element.classList.add(this.transitionClass); 25 element.classList.add(this.transitionClass);
24 element.addEventListener("webkitTransitionEnd", this, true); 26 element.addEventListener("webkitTransitionEnd", this, true);
27
28
29 //// TODO: replace this hack when webkit supports transitionStart event
30 transitionDuration = this.application.ninja.stylesController.getElementStyle(element, '-webkit-transition-duration', true);
31 element.njTimeout = window.setTimeout(function() {
32 this.captureWebkitTransitionEnd({
33 'target': element
34 });
35 }.bind(this), this._getMilliseconds(transitionDuration) + 100);
36 }
37 },
38
39 _getMilliseconds : {
40 value: function(duration) {
41 if(duration.indexOf('ms') !== -1) {
42 return parseInt(duration);
43 } else {
44 return parseFloat(duration)*1000;
45 }
25 } 46 }
26 }, 47 },
27 48
28 captureWebkitTransitionEnd : { 49 captureWebkitTransitionEnd : {
29 value : function(e) { 50 value : function(e) {
30 var el = e.target; 51 var el = e.target;
52
53 //// TODO: replace this hack when webkit supports transitionStart event (see above)
54 window.clearTimeout(el.njTimeout);
55
31 el.classList.remove(this.transitionClass); 56 el.classList.remove(this.transitionClass);
32 el.removeEventListener("webkitTransitionEnd", this, true); 57 el.removeEventListener("webkitTransitionEnd", this, true);
33 } 58 }
@@ -41,10 +66,29 @@ exports.PresetsController = Montage.create(Component, {
41 66
42 var stylesController = this.application.ninja.stylesController, 67 var stylesController = this.application.ninja.stylesController,
43 selectorBase = presetData.selectorBase, 68 selectorBase = presetData.selectorBase,
44 rules = []; 69 rules = [],
70 animationNames = [];
45 71
46 selectorBase = stylesController.generateClassName(selectorBase); 72 selectorBase = stylesController.generateClassName(selectorBase);
47 73
74 selection.forEach(function(element) {
75 var el = element._element,
76 animationName;
77
78 if(useTransition) {
79 this.addTransition(el);
80 }
81
82 ///// TODO: remove when we find out what to do with competing animations
83 animationName = stylesController.getElementStyle(el, '-webkit-animation-name');
84 if(animationName) {
85 animationNames.push(animationName);
86 }
87
88 el.classList.add(selectorBase);
89
90 }, this);
91
48 presetData.rules.forEach(function(rule, i) { 92 presetData.rules.forEach(function(rule, i) {
49 ///// Treat keyframed rules differently 93 ///// Treat keyframed rules differently
50 if(rule.isKeyFrameRule) { 94 if(rule.isKeyFrameRule) {
@@ -54,38 +98,19 @@ exports.PresetsController = Montage.create(Component, {
54 ); 98 );
55 } else { 99 } else {
56 var suffix = rule.selectorSuffix || ''; 100 var suffix = rule.selectorSuffix || '';
57 rules.push(stylesController.addRule('.'+selectorBase + suffix, rule.styles));
58 }
59 }, this);
60
61 selection.forEach(function(element) {
62 if(useTransition) {
63 this.addTransition(element);
64 }
65
66 element.classList.add(selectorBase);
67 101
68 //// Keep track of elements with presets and don't add duplicates 102 ///// TODO: remove when we find out what to do with competing animations
69 this.setCachedPreset(element, presetData.id, rules); 103 if(rule.styles['-webkit-animation-name'] && animationNames.length) {
104 rule.styles['-webkit-animation-name'] += ',' + animationNames.join(',');
105 }
70 106
107 rules.push(stylesController.addRule('.'+selectorBase + suffix, rule.styles));
108 }
71 }, this); 109 }, this);
72 110
73 } 111 }
74 }, 112 },
75 113
76 setCachedPreset : {
77 value: function(el, presetId, rules) {
78
79 }
80 },
81
82 getPresets : {
83 value: function(element) {
84
85 }
86
87 },
88
89 stringifyKeys : { 114 stringifyKeys : {
90 value: function(keysArray) { 115 value: function(keysArray) {
91 var keysString = ''; 116 var keysString = '';