From b7ca1821ad43403a2a54361ffc6a0cdf9cba0e59 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Mon, 2 Apr 2012 15:10:10 -0700
Subject: Animation Presets - Only combine animations if pre-existing
 animations exist

---
 js/controllers/presets-controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/controllers/presets-controller.js')

diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js
index 9d898a53..975f9f7a 100644
--- a/js/controllers/presets-controller.js
+++ b/js/controllers/presets-controller.js
@@ -100,7 +100,7 @@ exports.PresetsController = Montage.create(Component, {
                     var suffix = rule.selectorSuffix || '';
 
                     ///// TODO: remove when we find out what to do with competing animations
-                    if(rule.styles['-webkit-animation-name']) {
+                    if(rule.styles['-webkit-animation-name'] && animationNames.length) {
                         rule.styles['-webkit-animation-name'] += ',' + animationNames.join(',');
                     }
 
-- 
cgit v1.2.3