Merge branch 'refs/heads/ToolFixes' into WebGLMaterials

Conflicts:
	js/document/templates/montage-html/default_html.css
	js/mediators/element-mediator.js
	js/panels/properties.reel/properties.js
	js/tools/BrushTool.js
	js/tools/LineTool.js
	js/tools/PenTool.js
	js/tools/SelectionTool.js
	js/tools/ShapeTool.js
	js/tools/TranslateObject3DTool.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

4 files changed, 9 insertions, 117 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..4793c356 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -15,7 +15,9 @@ exports.animationPresets = {
                 "rules" : [{
                     "selectorSuffix" : "",
                     "styles" : {
-                        "-webkit-animation": "border-morph 2s infinite"
+                        "-webkit-animation-name": "border-morph",
+                        "-webkit-animation-duration": "2s",
+                        "-webkit-animation-iteration-count": "infinite"
                     }
                 },
                     {
diff --git a/js/panels/presets/style-presets.reel/style-presets.js b/js/panels/presets/style-presets.reel/style-presets.js
index 11f41822..5f10bbe3 100644
--- a/js/panels/presets/style-presets.reel/style-presets.js
+++ b/js/panels/presets/style-presets.reel/style-presets.js
@@ -22,60 +22,13 @@ exports.StylesLibrary = Montage.create(Component, {
     },
     handleNodeActivation: {
         value: function(presetData) {
-            var selection = this.application.ninja.selectedElements,
-                stylesController = this.application.ninja.stylesController,
-                selectorBase = presetData.selectorBase,
-                self = this, className;
-
-            if(!selection || !selection.length || selection.length === 0) {
-                return false;
-            }
-
-            function setStopRuleSelector(selector) {
-                self.application.ninja
-                    .currentDocument.documentRoot
-                    .elementModel.controller
-                    .changeSelector(self.application.ninja.currentDocument.documentRoot, null, selector);
+            this.application.ninja.presetsController.applyPreset(presetData, true);
             }
-
-            selectorBase = stylesController.generateClassName(selectorBase);
-
-            presetData.rules.forEach(function(rule) {
-                stylesController.addRule('.'+selectorBase + rule.selectorSuffix, rule.styles);
-            }, this);
-
-            selection.forEach(function(el) {
-                el._element.style.webkitTransition = "all 450ms linear";
-
-                el._element.addEventListener("webkitTransitionEnd", function presetTransition(e) {
-                    el._element.style.webkitTransition = '';
-                    setStopRuleSelector("*");
-                    this.removeEventListener("webkitTransitionEnd", presetTransition, true);
-
-                }, true);
-                setStopRuleSelector("transitionStopRule");
-                el._element.classList.add(selectorBase);
-
-                //// Keep track of elements with presets and don't add duplicates
-
-            }, this);
-
-
-        }
     },
     handleDragEnd : {
         value: function(sourceObject) {
             console.log(sourceObject);
         }
-    },
-    shouldChangeSelection : {
-        value : function(controller, newSelection, oldSelection) {
-            //
-            //debugger;
-            console.log('1Handle should change selection');
-            return false;
-        }
-    }
-
+        }
 
 });
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.js b/js/panels/presets/transitions-presets.reel/transitions-presets.js
index f7d84085..24fab684 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.js
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.js
@@ -22,25 +22,7 @@ exports.TransitionsLibrary = Montage.create(Component, {
     },
     handleNodeActivation: {
         value: function(presetData) {
-            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;
+            this.application.ninja.presetsController.applyPreset(presetData);
             }
-
-            selectorBase = stylesController.generateClassName(selectorBase);
-
-            presetData.rules.forEach(function(rule) {
-                this.application.ninja.stylesController.addRule('.' + selectorBase + rule.selectorSuffix, rule.styles);
-            }, this);
-
-            selection.forEach(function(el) {
-                el._element.classList.add(selectorBase);
-            }, this);
-
         }
-    }
 });