2 files changed, 54 insertions, 27 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, {
 
     addTransition: {
         value: function(element) {
+            var transitionDuration;
+
             element.classList.add(this.transitionClass);
             element.addEventListener("webkitTransitionEnd", this, true);
+
+
+            //// TODO: replace this hack when webkit supports transitionStart event
+            transitionDuration = this.application.ninja.stylesController.getElementStyle(element, '-webkit-transition-duration', true);
+            element.njTimeout = window.setTimeout(function() {
+                this.captureWebkitTransitionEnd({
+                    'target': element
+                });
+            }.bind(this), this._getMilliseconds(transitionDuration) + 100);
+        }
+    },
+
+    _getMilliseconds : {
+        value: function(duration) {
+            if(duration.indexOf('ms') !== -1) {
+                return parseInt(duration);
+            } else {
+                return parseFloat(duration)*1000;
+            }
         }
     },
 
     captureWebkitTransitionEnd : {
         value : function(e) {
             var el = e.target;
+
+            //// TODO: replace this hack when webkit supports transitionStart event (see above)
+            window.clearTimeout(el.njTimeout);
+
             el.classList.remove(this.transitionClass);
             el.removeEventListener("webkitTransitionEnd", this, true);
         }
@@ -41,10 +66,29 @@ exports.PresetsController = Montage.create(Component, {
 
             var stylesController = this.application.ninja.stylesController,
                 selectorBase = presetData.selectorBase,
-                rules = [];
+                rules = [],
+                animationNames = [];
 
             selectorBase = stylesController.generateClassName(selectorBase);
 
+            selection.forEach(function(element) {
+                var el = element._element,
+                    animationName;
+
+                if(useTransition) {
+                    this.addTransition(el);
+                }
+
+                ///// TODO: remove when we find out what to do with competing animations
+                animationName = stylesController.getElementStyle(el, '-webkit-animation-name');
+                if(animationName) {
+                    animationNames.push(animationName);
+                }
+
+                el.classList.add(selectorBase);
+
+            }, this);
+
             presetData.rules.forEach(function(rule, i) {
                 ///// Treat keyframed rules differently
                 if(rule.isKeyFrameRule) {
@@ -54,38 +98,19 @@ exports.PresetsController = Montage.create(Component, {
                     );
                 } else {
                     var suffix = rule.selectorSuffix || '';
-                    rules.push(stylesController.addRule('.'+selectorBase + suffix, rule.styles));
-                }
-            }, this);
-
-            selection.forEach(function(element) {
-                if(useTransition) {
-                    this.addTransition(element);
-                }
-
-                element.classList.add(selectorBase);
 
-                //// Keep track of elements with presets and don't add duplicates
-                this.setCachedPreset(element, presetData.id, rules);
+                    ///// TODO: remove when we find out what to do with competing animations
+                    if(rule.styles['-webkit-animation-name'] && animationNames.length) {
+                        rule.styles['-webkit-animation-name'] += ',' + animationNames.join(',');
+                    }
 
+                    rules.push(stylesController.addRule('.'+selectorBase + suffix, rule.styles));
+                }
             }, this);
 
         }
     },
 
-    setCachedPreset : {
-        value: function(el, presetId, rules) {
-
-        }
-    },
-
-    getPresets : {
-        value: function(element) {
-
-        }
-
-    },
-
     stringifyKeys : {
         value: function(keysArray) {
             var keysString = '';
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index b12a94b2..578c1622 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -14,7 +14,9 @@ exports.animationPresets = {
                 "selectorBase" : "border-morph",
                 "rules" : [{
                     "styles" : {
-                        "-webkit-animation": "border-morph 2s infinite"
+                        "-webkit-animation-name": "border-morph",
+                        "-webkit-animation-duration": "2s",
+                        "-webkit-animation-iteration-count": "infinite"
                     }
                 },
                     {