Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

5 files changed, 62 insertions, 2131 deletions

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/TimelinePanel.reel/TimelinePanel.js.orig b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js.orig
deleted file mode 100644
index 59263fc3..00000000
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js.orig
+++ /dev/null
@@ -1,2115 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-
-var Montage = require("montage/core/core").Montage,
-        Component = require("montage/ui/component").Component,
-        nj = require("js/lib/NJUtils").NJUtils,
-        EasingMenuPopup = require("js/panels/Timeline/EasingMenu.reel").EasingMenu;
-
-var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
-
-    user_layers: {
-        value: null,
-        serializable: true
-    },
-
-    track_container: {
-        value: null,
-        serializable: true
-    },
-
-    timeline_leftpane: {
-        value: null,
-        serializable: true
-    },
-
-    layer_tracks: {
-        value: null,
-        serializable: true
-    },
-
-    master_track: {
-        value: null,
-        serializable: true
-    },
-
-    time_markers: {
-        value: null,
-        serializable: true
-    },
-
-    playhead: {
-        value: null,
-        serializable: true
-    },
-
-    playheadmarker: {
-        value: null,
-        serializable: true
-    },
-
-    timetext: {
-        value: null,
-        serializable: true
-    },
-
-    timebar: {
-        value: null,
-        serializable: true
-    },
-
-    container_tracks: {
-        value: null,
-        serializable: true
-    },
-
-    end_hottext: {
-        value: null,
-        serializable: true
-    },
-
-    container_layers: {
-        value: null,
-        serializable: true
-    },
-
-    timeline_disabler: {
-        value: null,
-        serializable: true
-    },
-
-    checkable_relative: {
-        value: null,
-        serializable: true
-    },
-
-    checkable_absolute: {
-        value: null,
-        serializable: true
-    },
-
-    checkable_animated: {
-        value: null,
-        serializable: true
-    },
-
-    tl_configbutton: {
-        value: null,
-        serializable: true
-    },
-
-
-
-    /* === BEGIN: Models === */
-    _currentDocument: {
-        value : null
-    },
-
-    currentDocument : {
-        get : function() {
-            return this._currentDocument;
-        },
-        set : function(value) {
-            // If it's the same document, do nothing.
-            if (value === this._currentDocument) {
-                return;
-            }
-
-            if(!this._currentDocument && value.currentView === "design") {
-                this.enablePanel(true);
-            }
-
-            this._currentDocument = value;
-
-            if(!value) {
-                this._boolCacheArrays = false;
-                this.clearTimelinePanel();
-                this._boolCacheArrays = true;
-                this.enablePanel(false);
-            } else if(this._currentDocument.currentView === "design") {
-                this._boolCacheArrays = false;
-                this.clearTimelinePanel();
-                this._boolCacheArrays = true;
-
-                // Rebind the document events for the new document context
-                this._bindDocumentEvents();
-                
-                // Initialize the timeline for the document.
-                this.initTimelineForDocument();
-            }
-        }
-    },
-
-    handleChange: {
-        value: function() {
-            if(this.currentDocument && this.currentDocument.model.getProperty("domContainer")) {
-                this.currentSelectedContainer = this.currentDocument.model.getProperty("domContainer");
-            }
-        }
-    },
-    
-    _currentSelectedContainer: {
-        value: null
-    },
-    currentSelectedContainer: {
-        get: function() {
-            return this._currentSelectedContainer;
-        },
-        set: function(newVal) {
-            if(this._currentSelectedContainer !== newVal) {
-                this._currentSelectedContainer = newVal;
-                if (this._ignoreNextContainerChange === true) {
-                    this._ignoreNextContainerChange = false;
-                    return;
-                }
-                this.application.ninja.currentDocument.setLevel = true;
-                
-                if(this._currentDocument.currentView === "design") {
-                    this._boolCacheArrays = false;
-                    this.clearTimelinePanel();
-                    this._boolCacheArrays = true;
-    
-                    // Rebind the document events for the new document context
-                    this._bindDocumentEvents();
-                    
-                    // Initialize the timeline for the document.
-                    this.initTimelineForDocument();
-                }