6 files changed, 111 insertions, 57 deletions

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);
+
             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,38 +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) {
-                if(useTransition) {
-                    this.addTransition(element);
-                }
-
-                element.classList.add(selectorBase);
 
-                //// Keep track of elements with presets and don't add duplicates
-                this.setCachedPreset(element, presetData.id, rules);
+                    ///// 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(',');
+                    }
 
+                    rules.push(stylesController.addRule('.'+selectorBase + suffix, rule.styles));
+                }
             }, this);
 
         }
     },
 
-    setCachedPreset : {
-        value: function(el, presetId, rules) {
-
-        }
-    },
-
-    getPresets : {
-        value: function(element) {
-
-        }
-
-    },
-
     stringifyKeys : {
         value: function(keysArray) {
             var keysString = '';
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 67dedc49..9f6b9ed1 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -499,6 +499,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                 var n = this._elementCache.length;
                                 this._elementCache[index] = this._elementCache[n-1];
                                 this._elementCache.pop();
+                target.elementModel.isIn2DSnapCache = false;
                                 found = true;
                         }
 
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 9cbbc9b9..9b5081dd 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -25,7 +25,7 @@ exports.Ninja = Montage.create(Component, {
     },
 
     _isResizing: {
-        value: false
+        value: null
     },
     _resizedHeight : {
         value: 0
@@ -36,11 +36,18 @@ exports.Ninja = Montage.create(Component, {
 
     height: {
         get: function() {
+            if(this._height === null) {
+                var storedData = this.application.localStorage.getItem("timelinePanel");
+                if(storedData && storedData.value) {
+                    this._height = storedData.value;
+                }
+            }
             return this._height;
         },
         set: function(val) {
             if(this._height != val) {
                 this._height = val;
+                this.application.localStorage.setItem("timelinePanel", {"version": this.version, "value": val});
                 this.needsDraw = true;
             }
 
@@ -56,11 +63,18 @@ exports.Ninja = Montage.create(Component, {
 
     width: {
         get: function() {
+            if(this._width === null) {
+                var storedData = this.application.localStorage.getItem("rightPanelsContainer");
+                if(storedData && storedData.value) {
+                    this._width = storedData.value;
+                }
+            }
             return this._width;
         },
         set: function(val) {
             if(this._width != val) {
                 this._width = val;
+                this.application.localStorage.setItem("rightPanelsContainer", {"version": this.version, "value": val});
                 this.needsDraw = true;
             }
 
@@ -72,6 +86,8 @@ exports.Ninja = Montage.create(Component, {
             this.isResizing = true;
             this.height = parseInt(this.timeline.element.offsetHeight);
             this.width = parseInt(this.rightPanelContainer.offsetWidth);
+            this.rightPanelContainer.classList.add("disableTransition");
+            this.timeline.element.classList.add("disableTransition");
             this.needsDraw = true;
         }
     },
@@ -80,7 +96,6 @@ exports.Ninja = Montage.create(Component, {
         value:function(e) {
             this._resizedHeight = e._event.dY;
             this._resizedWidth = e._event.dX;
-            console.log("resizing");
             this.stage.resizeCanvases = true;
             this.needsDraw = true;
         }
@@ -88,13 +103,17 @@ exports.Ninja = Montage.create(Component, {
 
     handleResizeEnd: {
         value: function(e) {
-            this.height -= this._resizedHeight;
+//            this.height -= this._resizedHeight;