Merge branch 'refs/heads/master' into panel-cleanup-scroll

7 files changed, 128 insertions, 42 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 87151964..9c4f31b7 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -73,6 +73,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
     // Properties that require element planes to be updated
         _updatePlaneProps : {value: ["matrix", "left", "top", "width", "height"], writable: false },
+        _recalculateScrollOffsets : { value: false },
 
         ///////////////////////////////////////////////////////////////////////
         // Property accessors
@@ -117,7 +118,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         },
 
     initializeFromDocument:{
-        value:function(adjustScrollOffsets){
+        value:function(adjustScrollOffsets, useStageValues){
             var i,
                 documentRootChildren = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true),
                 stage = this.application.ninja.stage,
@@ -141,6 +142,13 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     t,
                     plane,
                     elt;
+                if(useStageValues) {
+                    initL = stage.userPaddingLeft;
+                    initT = stage.userPaddingTop;
+                    minLeft = stage.templateLeft;
+                    minTop = stage.templateTop;
+                    this._recalculateScrollOffsets = false;
+                }
                 for(i=0; i<len; i++) {
                     elt = documentRootChildren[i];
                     plane = this.addElement(elt);
@@ -149,17 +157,19 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         t = plane._rect.m_top - docTop;
                         if(l < minLeft) {
                             minLeft = l;
+                            stage.minLeftElement = elt;
                         }
                         if(t < minTop) {
                             minTop = t;
+                            stage.minTopElement = elt;
                         }
                     }
                 }
                 if(minLeft !== initL) {
-                    stage.userPaddingLeft = minLeft;
+                    stage.userPaddingLeft = (minLeft < 0) ? minLeft : 0;
                 }
                 if(minTop !== initT) {
-                    stage.userPaddingTop = minTop;
+                    stage.userPaddingTop = (minTop < 0) ? minTop : 0;
                 }
             }
         }
@@ -274,9 +284,11 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     t,
                     plane,
                     changed = false,
+                    elt,
                     adjustStagePadding = !isChanging || (event.detail.data.prop !== "matrix");
                 for(var i=0; i < len; i++) {
-                    plane = els[i].elementModel.props3D.elementPlane;
+                    elt = els[i];
+                    plane = elt.elementModel.props3D.elementPlane;
                     if(plane) {
                         plane.init();
                         if(adjustStagePadding) {
@@ -284,22 +296,34 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                             t = plane._rect.m_top - docTop;
                             if(l < minLeft) {
                                 minLeft = l;
+                                stage.minLeftElement = elt;
+                            } else if((elt === stage.minLeftElement) && (l > minLeft)) {
+                                this._recalculateScrollOffsets = true;
                             }
+
                             if(t < minTop) {
                                 minTop = t;
+                                stage.minTopElement = elt;
+                            } else if((elt === stage.minTopElement) && (t > minTop)) {
+                                this._recalculateScrollOffsets = true;
                             }
                         }
                     }
                 }
 
                 if(adjustStagePadding) {
-                    if(minLeft !== stage.userPaddingLeft) {
-                        stage.userPaddingLeft = minLeft;
-                        changed = true;
-                    }
-                    if(minTop !== stage.userPaddingTop) {
-                        stage.userPaddingTop = minTop;
+                    if(this._recalculateScrollOffsets && !isChanging) {
+                        this.initializeFromDocument(true, true);
                         changed = true;
+                    } else {
+                        if(minLeft !== stage.userPaddingLeft) {
+                            stage.userPaddingLeft = minLeft;
+                            changed = true;
+                        }
+                        if(minTop !== stage.userPaddingTop) {
+                            stage.userPaddingTop = minTop;
+                            changed = true;
+                        }
                     }
                 }
 
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index c7288d28..18568619 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -50,6 +50,7 @@ var Keyboard = exports.Keyboard = {
     X:88,
     Y:89,
     Z:90,
+    F5:116,
     F6:117,
     PLUS:187,
     MINUS:189
@@ -218,7 +219,11 @@ exports.KeyboardMediator = Montage.create(Component, {
 
                 // F6 keyboard shortcut to add a keyframe to the timeline
                 if (evt.keyCode == Keyboard.F6) {
-                    this.application.ninja.timeline.handleKeyframeShortcut();
+                    this.application.ninja.timeline.handleKeyframeShortcut("insert");
+                    return;
+                }
+                if (evt.keyCode == Keyboard.F5) {
+                    this.application.ninja.timeline.handleKeyframeShortcut("remove");
                     return;
                 }
 
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index c6d46911..4f2a137e 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -156,7 +156,7 @@ exports.Splitter = Montage.create(Component, {
         }
     },
     restore:{
-        value: function() {
+        value: function(onSwitchFromCodeDocument) {
             //Get splitter initial value from SettingManager
             var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id")), temp = this.collapsed;
             if(storedData && this.element.getAttribute("data-montage-id") !== null) {
@@ -172,7 +172,11 @@ exports.Splitter = Montage.create(Component, {
                     this.panel.addEventListener("webkitTransitionEnd", this, false);
                 }
                 this.disabled = false;
-                this.needsDraw = true;
+                if(onSwitchFromCodeDocument) {
+                    this.draw();    // When switching from code document, draw immediately so stage size is correct
+                } else {
+                    this.needsDraw = true;
+                }
             }
         }
     }
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 2cbd9e2b..53a3b299 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -869,12 +869,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         this.checkable_lock.addEventListener("click",this.handleLockLayerClick.bind(this),false);
             this.checkable_visible.addEventListener("click",this.handleLayerVisibleClick.bind(this),false);
             
-            // Bind some bindings
-            Object.defineBinding(this, "currentSelectedContainer", {
-                boundObject:this.application.ninja,
-                boundObjectPropertyPath:"currentSelectedContainer",
-                oneway:true
-            });
             this.addPropertyChangeListener("currentDocument.model.domContainer", this);
             
                         // Start the panel out in disabled mode by default
@@ -1034,17 +1028,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },