aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorEric Guzman2012-04-02 15:10:10 -0700
committerEric Guzman2012-04-02 15:10:10 -0700
commitb7ca1821ad43403a2a54361ffc6a0cdf9cba0e59 (patch)
treeb147b2347a9c0e7140f3ef70eddc05b0a9a1a8da /js
parent0491907d1cba1534d88c49f2bb4035484831bbe5 (diff)
downloadninja-b7ca1821ad43403a2a54361ffc6a0cdf9cba0e59.tar.gz
Animation Presets - Only combine animations if pre-existing animations exist
Diffstat (limited to 'js')
-rw-r--r--js/controllers/presets-controller.js2
1 files changed, 1 insertions, 1 deletions
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, {
100 var suffix = rule.selectorSuffix || ''; 100 var suffix = rule.selectorSuffix || '';
101 101
102 ///// TODO: remove when we find out what to do with competing animations 102 ///// TODO: remove when we find out what to do with competing animations
103 if(rule.styles['-webkit-animation-name']) { 103 if(rule.styles['-webkit-animation-name'] && animationNames.length) {
104 rule.styles['-webkit-animation-name'] += ',' + animationNames.join(','); 104 rule.styles['-webkit-animation-name'] += ',' + animationNames.join(',');
105 } 105 }
106 106