1 files changed, 0 insertions, 561 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js.orig b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js.orig
deleted file mode 100644
index e2e52a3b..00000000
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js.orig
+++ /dev/null
@@ -1,561 +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;
-var Component = require("montage/ui/component").Component;
-
-var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
-
-    /* ===- Begin Models ==== */
-    hasTemplate:{
-        value: true
-    },
-
-<<<<<<< HEAD
-=======
-    trackEditorProperty:{
-        value:""
-    },
-
-    animatedElement:{
-        value:null
-    },
-
-    isSubproperty:{
-        value:true
-    },
-
->>>>>>> refs/heads/TimelineUberJD
-    _propTweenRepetition:{
-        value:null
-    },
-    propTweenRepetition:{
-        get:function () {
-            return this._propTweenRepetition;
-        },
-        set:function (newVal) {
-            this._propTweenRepetition = newVal;
-        }
-    },
-
-    _propTweens:{
-        value:[]
-    },
-    propTweens:{
-        serializable:true,
-        get:function () {
-            return this._propTweens;
-        },
-        set:function (newVal) {
-            this._propTweens = newVal;
-        }
-    },
-
-    _propTrackData:{
-        value:false
-    },
-    propTrackData:{
-        serializable:true,
-        get:function () {
-            return this._propTrackData;
-        },
-        set:function (val) {
-            this._propTrackData = val;
-            if (this._propTrackData) {
-                this.setData();
-            }
-        }
-    },
-    _trackID:{
-        value:null
-    },
-    trackID:{
-        serializable:true,
-        get:function () {
-            return this._trackID;
-        },
-        set:function (value) {
-            if (value !== this._trackID) {
-                this._trackID = value;
-            }
-        }
-    },
-
-    _trackType:{
-        value:null
-    },
-    trackType:{
-        serializable:true,
-        get:function () {
-            return this._trackType;
-        },
-        set:function (value) {
-            if (value !== this._trackType) {
-                this._trackType = value;
-            }
-        }
-    },
-
-    _styleIndex:{
-        value:null
-    },
-    styleIndex:{
-        serializable:true,
-        get:function () {
-            return this._styleIndex;
-        },
-        set:function (value) {
-            if (value !== this._styleIndex) {
-                this._styleIndex = value;
-            }
-        }
-    },
-
-    trackEditorProperty:{
-        value:""
-    },
-
-    animatedElement:{
-        value:null
-    },
-
-    isSubproperty:{
-        value:true
-    },
-
-    nextKeyframe:{
-        value:1
-    },
-
-    ninjaStylesContoller:{
-        value:null
-    },
-
-    animationName:{
-        value:null
-    },
-
-    currentKeyframeRule:{
-        value:null
-    },
-
-    trackDuration:{
-        value:0
-    },
-
-    timelineTrack:{
-        value:null
-    },
-
-    setData:{
-        value:function () {
-            if (typeof(this.propTrackData) === "undefined") {
-                return;
-            }
-
-            this.styleIndex = this.propTrackData.styleIndex;
-            this.propTweens = this.propTrackData.propTweens;
-            this.trackType = this.propTrackData.trackType;
-            this.trackEditorProperty = this.propTrackData.trackEditorProperty;
-            this.currentKeyframeRule = this.propTrackData.existingRule;
-            this.needsDraw = true;
-        }
-    },
-    /* ===- End Models ==== */
-
-    /* ===- Begin Draw Cycle ==== */
-    prepareForDraw:{
-        value:function () {
-            this.element.addEventListener("click", this, false);
-            this.trackID = this.parentComponent.parentComponent.parentComponent.parentComponent.trackID;
-            this.animatedElement = this.parentComponent.parentComponent.parentComponent.parentComponent.animatedElement;
-            this.ninjaStylesContoller = this.application.ninja.stylesController;
-        }
-    },
-
-    didDraw:{
-        value:function () {
-            if (this.currentKeyframeRule) {
-                this.retrieveStoredStyleTweens();
-            }
-        }
-    },
-    /* ===- End Draw Cycle ==== */
-
-<<<<<<< HEAD
-    prepareForDraw:{
-        value:function(){
-            this.element.addEventListener("click", this, false);
-            this.timelineTrack = this.parentComponent.parentComponent.parentComponent.parentComponent;
-            this.trackID = this.timelineTrack.trackID;
-            this.animatedElement = this.timelineTrack.animatedElement;
-            this.ninjaStylesContoller = this.application.ninja.stylesController;
-        }
-    },
-
-    didDraw:{
-        value:function () {
-            if(this.currentKeyframeRule){
-                this.retrieveStoredStyleTweens();
-            }
-        }
-    },
-
-=======
-    /* ===- Begin Event Handlers ==== */
->>>>>>> refs/heads/TimelineUberJD
-    handleClick:{
-        value:function (ev) {
-
-            var selectIndex , currentSelectedStyleIndex;
-            if (ev.shiftKey) {
-                if (this.trackType == "position") {
-                    this.timelineTrack.handleNewTween(ev);
-                }
-                if (this.propTweens.length < 1) {
-<<<<<<< HEAD