10 files changed, 130 insertions, 130 deletions

diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js
new file mode 100644
index 00000000..7152ba93
--- /dev/null
+++ b/js/controllers/presets-controller.js
@@ -0,0 +1,108 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component;
+
+exports.PresetsController = Montage.create(Component, {
+
+    hasTemplate : {
+        value: false
+    },
+
+    transitionClass : {
+        value : "nj-preset-transition"
+    },
+
+    addTransition: {
+        value: function(element) {
+            element.classList.add(this.transitionClass);
+            element.addEventListener("webkitTransitionEnd", this, true);
+        }
+    },
+
+    captureWebkitTransitionEnd : {
+        value : function(e) {
+            var el = e.target;
+            el.classList.remove(this.transitionClass);
+            el.removeEventListener("webkitTransitionEnd", this, true);
+        }
+    },
+
+    applyPreset : {
+        value: function(presetData, useTransition) {
+            var selection = this.application.ninja.selectedElements;
+
+            if(!selection || !selection.length || selection.length === 0) { return false; }
+
+            var stylesController = this.application.ninja.stylesController,
+                selectorBase = presetData.selectorBase,
+                rules = [];
+
+            selectorBase = stylesController.generateClassName(selectorBase);
+
+            presetData.rules.forEach(function(rule, i) {
+                ///// Treat keyframed rules differently
+                if(rule.isKeyFrameRule) {
+                    this.application.ninja.stylesController.addRule(
+                        '@-webkit-keyframes ' + presetData.selectorBase,
+                        this.stringifyKeys(rule.keys)
+                    );
+                } else {
+                    var suffix = rule.selectorSuffix || '';
+                    rules.push(stylesController.addRule('.'+selectorBase + suffix, rule.styles));
+                }
+            }, this);
+
+            selection.forEach(function(element) {
+                var el = element._element;
+
+                if(useTransition) {
+                    this.addTransition(el);
+                }
+
+                el.classList.add(selectorBase);
+
+                //// Keep track of elements with presets and don't add duplicates
+                this.setCachedPreset(el, presetData.id, rules);
+
+            }, this);
+
+        }
+    },
+
+    setCachedPreset : {
+        value: function(el, presetId, rules) {
+
+        }
+    },
+
+    getPresets : {
+        value: function(element) {
+
+        }
+
+    },
+
+    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;
+        }
+    }
+});
\ No newline at end of file
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css
index 68300edf..6c2b415f 100755
--- a/js/document/templates/montage-html/default_html.css
+++ b/js/document/templates/montage-html/default_html.css
@@ -72,4 +72,8 @@ body
 
 .elem-red-outline {
   outline: red solid thin;
+}
+
+.nj-preset-transition {
+    -webkit-transition: all 450ms linear !important;
 }
\ No newline at end of file
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 7b5a6e52..ead7f576 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -316,6 +316,11 @@
                 "name": "StylesController"
             },
 
+            "presetsController": {
+                "module": "js/controllers/presets-controller",
+                "name": "PresetsController"
+            },
+
             "filePickerController": {
                 "module": "js/io/ui/file-picker/file-picker-controller",
                 "name": "FilePickerController"
@@ -364,6 +369,7 @@
                     "popupManager":         {"@": "popupManager1"},
                                         "colorController":      {"@": "colorController1"},
                     "stylesController":     {"@": "stylesController"},
+                    "presetsController":     {"@": "presetsController"},
                     "filePickerController": {"@": "filePickerController"},
                     "newFileController":    {"@": "newFileController"},
                     "coreIoApi":                {"@": "coreIoApi1"},
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js
index ab200212..6a16da54 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..b12a94b2 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -13,7 +13,6 @@ exports.animationPresets = {