3 files changed, 58 insertions, 15 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/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 2cbd9e2b..1c023fdb 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1034,17 +1034,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..85fce1ec 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -702,17 +702,22 @@ 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)
-                this.updateKeyframeRule();
+            if(ev.actionType == "insert"){
+                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);
+                    this.updateKeyframeRule();
+                }
+            } else if(ev.actionType == "remove"){
+                this.removeTween();
             }
+
         }
     },
 
@@ -801,6 +806,41 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
+    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;
+            }
+        }
+    },
+
     createMatchingPositionSizeTween:{
         value:function (newTween) {
             var i;