6 files changed, 73 insertions, 32 deletions

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, {
     },
 
     handleKeyframeShortcut:{
-        value:function(){
-            //console.log(this.currentLayersSelected);
-            //console.log(this.trackRepetition);
+        value:function(action){
             var tempEv = {};
             tempEv.offsetX = this.playheadmarker.offsetLeft;
+            tempEv.actionType = action;
             if (typeof(this.trackRepetition.childComponents[this.currentLayersSelected[0]]) !== "undefined") {
                 this.trackRepetition.childComponents[this.currentLayersSelected[0]].handleKeyboardShortcut(tempEv);
             } else {
                 // oops, we do not have a layer selected.  We should growl at the user.  For now, this will fail silently.
             }
-            
         }
     },
 
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index bf380e00..68ea928a 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -702,15 +702,17 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
     handleKeyboardShortcut:{
         value:function(ev){
-            if (this.tweens.length < 1) {
-                this.insertTween(0);
-                this.addAnimationRuleToElement(ev);
-                this.updateKeyframeRule();
-            } else {
-                //this.handleNewTween(ev);
-                
-                // Split a tween!
-                this.splitTweenAt(this.application.ninja.timeline.playheadmarker.offsetLeft)
+            if(ev.actionType == "insert"){
+                if (this.tweens.length < 1) {
+                    this.insertTween(0);
+                    this.addAnimationRuleToElement(ev);
+                    this.updateKeyframeRule();
+                } else {
+                    this.handleNewTween(ev);
+                    this.updateKeyframeRule();
+                }
+            } else if(ev.actionType == "remove"){
+                this.removeTween();
                 this.updateKeyframeRule();
             }
         }
@@ -795,9 +797,42 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 this.createMatchingPositionSizeTween(newTween);
             }
 
+            this.application.ninja.currentDocument.model.needsSave = true;
+        }
+    },
+
+    removeTween:{
+        value:function(){
+            var tweenIDToRemove = this.application.ninja.timeline.selectedTweens[0].tweenID,
+                oldPosition = this.application.ninja.timeline.selectedTweens[0].spanPosition,
+                oldSpanWidth = this.application.ninja.timeline.selectedTweens[0].spanWidth;
+
+            if(tweenIDToRemove == this.tweens[this.tweens.length-1].tweenData.tweenID){
+                this.trackDuration = this.tweens[this.tweens.length-2].tweenData.keyFrameMillisec;
+                this.tweens.pop();
+                return;
+            }
+
+            // Update the next tween to have new span position and width.
+            this.tweens[tweenIDToRemove + 1].tweenData.spanPosition = oldPosition;
+            this.tweens[tweenIDToRemove + 1].spanPosition = oldPosition;
+            this.tweens[tweenIDToRemove + 1].tweenData.spanWidth = this.tweens[tweenIDToRemove + 1].tweenData.spanWidth + oldSpanWidth;
+            this.tweens[tweenIDToRemove + 1].spanWidth = this.tweens[tweenIDToRemove + 1].spanWidth + oldSpanWidth;
 
+            // redraw the tweens
+            for(var i in this.tweenRepetition.childComponents){
+                this.tweenRepetition.childComponents[i].setData();
+            }
 
+            // remove the selected tween
+            this.tweens.splice(tweenIDToRemove, 1);
             this.application.ninja.currentDocument.model.needsSave = true;
+
+            // update the tween ids
+            for (var j = 0; j < this.tweens.length; j++) {
+                this.tweens[j].tweenID = j;
+                this.tweens[j].tweenData.tweenID = j;
+            }
         }
     },
 
@@ -955,6 +990,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                                 newTween.tweenData.easing = "none";
                             }
                             this.tweens.push(newTween);
+                            this.createMatchingPositionSizeTween(newTween);
                         }
                         this.nextKeyframe += 1;
                     }
@@ -982,8 +1018,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function(ruleSet){
             for(var i in ruleSet){
                 var styleProp = ruleSet[i][0].style[0];
-                //console.log(styleProp);
-                //console.log(ruleSet[i]);
                 this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(styleProp, ruleSet[i]);
             }
         }
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 5e913c76..319ffe87 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -19,6 +19,7 @@ exports.Stage = Montage.create(Component, {
     // TODO - Need to figure out how to remove this dependency
     // Needed by some tools that depend on selectionDrawn event to set up some logic
     drawNow: { value : false },
+    switchedFromCodeDoc: { value : false },
 
     // TO REVIEW