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

Conflicts:
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/runtime/GLRuntime.js
	js/helper-classes/RDGE/src/core/script/MeshManager.js
	js/helper-classes/RDGE/src/core/script/engine.js
	js/helper-classes/RDGE/src/core/script/fx/ssao.js
	js/helper-classes/RDGE/src/core/script/init_state.js
	js/helper-classes/RDGE/src/core/script/run_state.js
	js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
	js/helper-classes/RDGE/src/core/script/utilities.js
	js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
	js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/lib/drawing/world.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/linear-gradient-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-blur-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js
	js/preloader/Preloader.js

1 files changed, 1 insertions, 48 deletions

diff --git a/js/panels/presets/style-presets.reel/style-presets.js b/js/panels/presets/style-presets.reel/style-presets.js
index 11f41822..6a28e069 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);
-            }
-
-            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);
-
-
+            this.application.ninja.presetsController.applyPreset(presetData, true);
         }
     },
     handleDragEnd : {
         value: function(sourceObject) {
             console.log(sourceObject);
         }
-    },
-    shouldChangeSelection : {
-        value : function(controller, newSelection, oldSelection) {
-            //
-            //debugger;
-            console.log('1Handle should change selection');
-            return false;
-        }
     }
 
-
 });