Merge branch 'refs/heads/master' into CSSPanelUpdates

93 files changed, 10915 insertions, 14156 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index a308f191..ddaeb061 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -32,9 +32,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     _iframeHolder: { value: null, enumerable: false },
     _textHolder: { value: null, enumerable: false },
     _codeMirrorCounter: {value: 1, enumerable: false},
-
-    canSave:{value: false},//for Save menu state update
-    canSaveAll:{value: false},//for Save All menu state update
     
     activeDocument: {
         get: function() {
@@ -50,12 +47,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                 if(!!this._activeDocument.editor){
                     this._activeDocument.editor.focus();
                 }
-
-                this.canSave = doc.needsSave;
-                this.canSaveAll = doc.needsSave;
-            }else{
-                this.canSave = false;
-                this.canSaveAll = false;
             }
         }
     },
@@ -80,7 +71,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     handleAddComponentFirstDraw: {
         value: function (e) {
                 //TODO: Add logic to reparse the document for dynamically added styles
-                console.log(e);
+                //console.log(e);
         }
     },
     
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js
index 975f9f7a..4c177189 100644
--- a/js/controllers/presets-controller.js
+++ b/js/controllers/presets-controller.js
@@ -72,20 +72,19 @@ exports.PresetsController = Montage.create(Component, {
             selectorBase = stylesController.generateClassName(selectorBase);
 
             selection.forEach(function(element) {
-                var el = element._element,
-                    animationName;
+                var animationName;
 
                 if(useTransition) {
-                    this.addTransition(el);
+                    this.addTransition(element);
                 }
 
                 ///// TODO: remove when we find out what to do with competing animations
-                animationName = stylesController.getElementStyle(el, '-webkit-animation-name');
+                animationName = stylesController.getElementStyle(element, '-webkit-animation-name');
                 if(animationName) {
                     animationNames.push(animationName);
                 }