Merge branch 'refs/heads/NINJAmaster' into TimelineUber

87 files changed, 10933 insertions, 14105 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index a308f191..0f02ca3c 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;
             }
         }
     },
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js
index 0467f73c..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);
+