Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II

Conflicts:
	js/helper-classes/3D/view-utils.js
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js
	js/tools/Translate3DToolBase.js

1 files changed, 1 insertions, 46 deletions

diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js
index 272f6c5b..92437cfd 100644
--- a/js/panels/presets/animations-presets.reel/animations-presets.js
+++ b/js/panels/presets/animations-presets.reel/animations-presets.js
@@ -22,52 +22,7 @@ exports.AnimationsLibrary = Montage.create(Component, {
     },
     handleNodeActivation: {
         value: function(presetData) {
-            //debugger;
-            var selection = this.application.ninja.selectedElements,
-                stylesController = this.application.ninja.stylesController,
-                selectorBase = presetData.selectorBase,
-                self = this;
-
-            if(!selection || !selection.length || selection.length === 0) {
-                return false;
-            }
-
-            selectorBase = stylesController.generateClassName(selectorBase);
-
-            presetData.rules.forEach(function(rule) {
-                if(rule.isKeyFrameRule) {
-                    this.application.ninja.stylesController.addRule(
-                        '@-webkit-keyframes ' + presetData.selectorBase,
-                        this.stringifyKeys(rule.keys)
-                    );
-                } else {
-                    this.application.ninja.stylesController.addRule('.' + selectorBase + rule.selectorSuffix, rule.styles);
-                }
-
-            }, this);
-
-            selection.forEach(function(el) {
-                el._element.classList.add(selectorBase);
-            }, this);
-
-        }
-    },
-
-    stringifyKeys : {
-        value: function(keysArray) {
-            var keysString = '';
-
-            keysArray.forEach(function(key) {
-                var styles = '', style;
-
-                for(style in key.styles) {
-                    styles += style + ':' + key.styles[style] + '; ';
-                }
-
-                keysString += key.keyText + ' {' + styles + ' }';
-            });
-
-            return keysString;
+            this.application.ninja.presetsController.applyPreset(presetData);
         }
         }
 });