6 files changed, 17 insertions, 134 deletions

diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js
index ab200212..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);
+        }
+        }
 });
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 64f91ea6..578c1622 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -13,9 +13,10 @@ exports.animationPresets = {
                 "text": "Border Morph",
                 "selectorBase" : "border-morph",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
-                        "-webkit-animation": "border-morph 2s infinite"
+                        "-webkit-animation-name": "border-morph",
+                        "-webkit-animation-duration": "2s",
+                        "-webkit-animation-iteration-count": "infinite"
                     }
                 },
                     {
@@ -91,7 +92,6 @@ exports.animationPresets = {
                 "text": "Rotater",
                 "selectorBase" : "rotate-with-alpha-keyframes",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "-webkit-animation-name": "rotate-with-alpha-keyframes",
                         "-webkit-animation-duration": "5s",
diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js
index 82bec34f..10b24ff4 100644
--- a/js/panels/presets/default-style-presets.js
+++ b/js/panels/presets/default-style-presets.js
@@ -11,9 +11,9 @@ exports.stylePresets = {
         "children": [
             {
                 "text": "Border-Radius",
+                "id": "njBorderRadius",
                 "selectorBase" : "border-radius-preset",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "border-radius": "100px",
                         "border" : "1px solid #333"
@@ -22,9 +22,9 @@ exports.stylePresets = {
             },
             {
                 "text": "Drop Shadow",
+                "id": "njDropShadow",
                 "selectorBase" : "drop-shadow",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "box-shadow": "2px 2px 50px rgba(0,0,0,0.5)",
                         "border" : "1px solid #CCC"
@@ -33,9 +33,10 @@ exports.stylePresets = {
             },
             {
                 "text": "Fancy Box",
+                "id": "njFancyBox",
                 "selectorBase" : "fancy-box",
                 "rules" : [{
-                    "selectorSuffix" : "",
+                    "selectorSuffix": "",
                     "styles" : {
                         "box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333",
                         "border" : "1px solid #FFF",
@@ -50,9 +51,9 @@ exports.stylePresets = {
         "children": [
             {
                 "text": "Italic",
+                "id": "njItalic",
                 "selectorBase" : "italicize",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "font-style": "italic"
                     }
@@ -60,9 +61,9 @@ exports.stylePresets = {
             },
             {
                 "text": "Text Shadow",
+                "id": "njTextShadow",
                 "selectorBase" : "italicize",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "text-shadow": "1px 1px 3px #333"
                     }
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js
index 15f4882f..f8968085 100644
--- a/js/panels/presets/default-transition-presets.js
+++ b/js/panels/presets/default-transition-presets.js
@@ -13,7 +13,6 @@ exports.transitionPresets = {
                 "text": "Fade In",
                 "selectorBase" : "fade-in",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "opacity": "0.25",
                         "-webkit-transition": "all 0.4s ease-in"
@@ -29,7 +28,6 @@ exports.transitionPresets = {
                 "text": "Fade Out",
                 "selectorBase" : "fade-out",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "opacity": "1",
                         "-webkit-transition": "all 0.4s ease-in"
@@ -48,7 +46,6 @@ exports.transitionPresets = {
                 "text": "Slide Right",
                 "selectorBase" : "slide-right",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }
@@ -63,7 +60,6 @@ exports.transitionPresets = {
                 "text": "Slide Left",
                 "selectorBase" : "slide-left",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }
@@ -78,7 +74,6 @@ exports.transitionPresets = {
                 "text": "Rotate",