Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

4 files changed, 99 insertions, 145 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index b35251ad..efb33292 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -5,22 +5,27 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-    NJComponent =   require("js/lib/nj-base").NJComponent;
+    Component = require("montage/ui/component").Component;
 
-var ElementController = exports.ElementController = Montage.create(NJComponent, {
+exports.ElementController = Montage.create(Component, {
 
     addElement: {
         value: function(el, styles) {
             this.application.ninja.currentDocument.documentRoot.appendChild(el);
-            // Nested elements -
-            // TODO make sure the CSS is correct before nesting elements
+            // Nested elements - TODO make sure the CSS is correct before nesting elements
             // this.application.ninja.currentSelectedContainer.appendChild(el);
-            this.application.ninja.stylesController.setElementStyles(el, styles);
+            if(styles) {
+                this.application.ninja.stylesController.setElementStyles(el, styles);
+            }
         }
     },
 
+    // Remove the element from the DOM and clear the GLWord.
     removeElement: {
         value: function(el) {
+            if(el.elementModel && el.elementModel.shapeModel && el.elementModel.shapeModel.GLWorld) {
+                el.elementModel.shapeModel.GLWorld.clearTree();
+            }
             el.parentNode.removeChild(el);
         }
     },
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index ef453bea..c9164e3e 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -72,8 +72,9 @@ exports.ShapesController = Montage.create(CanvasController, {
                     canvas.setAttribute("data-RDGE-id", njModule.NJUtils.generateRandom());
                     canvas.width = el.width;
                     canvas.height = el.height;
-                    this.application.ninja.elementMediator.replaceElement(el, canvas);
-                    NJevent("elementDeleted", el);
+                    canvas.elementModel = el.elementModel;
+                    this.application.ninja.currentDocument.documentRoot.replaceChild(canvas, el);
+                    NJevent("elementsRemoved", el);
                     el = canvas;
                     this.toggleWebGlMode(el, value);
                     el.elementModel.shapeModel.GLWorld.render();
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js
index 7152ba93..975f9f7a 100644
--- a/js/controllers/presets-controller.js
+++ b/js/controllers/presets-controller.js
@@ -20,14 +20,39 @@ exports.PresetsController = Montage.create(Component, {
 
     addTransition: {
         value: function(element) {
+            var transitionDuration;
+
             element.classList.add(this.transitionClass);
             element.addEventListener("webkitTransitionEnd", this, true);
+
+
+            //// TODO: replace this hack when webkit supports transitionStart event
+            transitionDuration = this.application.ninja.stylesController.getElementStyle(element, '-webkit-transition-duration', true);
+            element.njTimeout = window.setTimeout(function() {
+                this.captureWebkitTransitionEnd({
+                    'target': element
+                });
+            }.bind(this), this._getMilliseconds(transitionDuration) + 100);
+        }
+    },
+
+    _getMilliseconds : {
+        value: function(duration) {
+            if(duration.indexOf('ms') !== -1) {
+                return parseInt(duration);
+            } else {
+                return parseFloat(duration)*1000;
+            }
         }
     },
 
     captureWebkitTransitionEnd : {
         value : function(e) {
             var el = e.target;
+
+            //// TODO: replace this hack when webkit supports transitionStart event (see above)
+            window.clearTimeout(el.njTimeout);
+
             el.classList.remove(this.transitionClass);
             el.removeEventListener("webkitTransitionEnd", this, true);
         }
@@ -41,10 +66,29 @@ exports.PresetsController = Montage.create(Component, {
 
             var stylesController = this.application.ninja.stylesController,
                 selectorBase = presetData.selectorBase,
-                rules = [];
+                rules = [],
+                animationNames = [];
 
             selectorBase = stylesController.generateClassName(selectorBase);
 
+            selection.forEach(function(element) {
+                var el = element._element,
+                    animationName;
+
+                if(useTransition) {
+                    this.addTransition(el);
+                }
+
+                ///// TODO: remove when we find out what to do with competing animations
+                animationName = stylesController.getElementStyle(el, '-webkit-animation-name');
+                if(animationName) {
+                    animationNames.push(animationName);
+                }
+
+                el.classList.add(selectorBase);
+
+            }, this);
+
             presetData.rules.forEach(function(rule, i) {
                 ///// Treat keyframed rules differently
                 if(rule.isKeyFrameRule) {
@@ -54,40 +98,19 @@ exports.PresetsController = Montage.create(Component, {
                     );
                 } else {
                     var suffix = rule.selectorSuffix || '';
-                    rules.push(stylesController.addRule('.'+selectorBase + suffix, rule.styles));
-                }
-            }, this);
 
-            selection.forEach(function(element) {
-                var el = element._element;
+                    ///// TODO: remove when we find out what to do with competing animations
+                    if(rule.styles['-webkit-animation-name'] && animationNames.length) {
+                        rule.styles['-webkit-animation-name'] += ',' + animationNames.join(',');
+                    }
 
-                if(useTransition) {
-                    this.addTransition(el);
+                    rules.push(stylesController.addRule('.'+selectorBase + suffix, rule.styles));
                 }
-
-                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 = '';
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 53cca029..dbb3f30d 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -6,8 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 
 var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component,
-    NJUtils     = require("js/lib/NJUtils").NJUtils;
+    Component = require("montage/ui/component").Component;
 
 exports.SelectionController = Montage.create(Component, {
 
@@ -45,13 +44,10 @@ exports.SelectionController = Montage.create(Component, {
         value: function() {
             this.eventManager.addEventListener("openDocument", this, false);
             this.eventManager.addEventListener("elementAdded", this, false);
-            this.eventManager.addEventListener("elementDeleted", this, false);
+            this.eventManager.addEventListener("elementsRemoved", this, false);
             this.eventManager.addEventListener("selectAll", this, false);