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

3 files changed, 27 insertions, 1072 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js.orig b/js/panels/Timeline/Layer.reel/Layer.js.orig
deleted file mode 100644
index d3301014..00000000
--- a/js/panels/Timeline/Layer.reel/Layer.js.orig
+++ /dev/null
@@ -1,1057 +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 Collapser = require("js/panels/Timeline/Collapser").Collapser;
-var Hintable = require("js/components/hintable.reel").Hintable;
-var LayerStyle = require("js/panels/Timeline/Style.reel").LayerStyle;
-var DynamicText = require("montage/ui/dynamic-text.reel").DynamicText;
-var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;
-var nj = require("js/lib/NJUtils").NJUtils;
-var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
-
-var Layer = exports.Layer = Montage.create(Component, {
-
-    hasTemplate:{
-        value: true
-    },
-    
-    /* Begin: Models */
-   
-        /* Main collapser model: the main collapser for the layer */
-    _mainCollapser : {
-        value: false
-    },
-    mainCollapser: {
-        get: function() {
-                return this._mainCollapser;
-        },
-        set: function(newVal) {
-                this._mainCollapser = newVal;
-        }
-    },
-    
-    /* Style models: the array of styles, and the repetition that uses them */
-    _arrLayerStyles : {
-            value: []
-    },
-    arrLayerStyles : {
-        serializable: true,
-        get: function() {
-                return this._arrLayerStyles;
-        },
-        set: function(newVal) {
-                this._arrLayerStyles = newVal;
-        }
-    },
-    _styleRepetition : {
-        value: false
-    },
-    styleRepetition : {
-        serializable: true,
-        get: function() {
-                return this._styleRepetition;
-        },
-        set: function(newVal) {
-                this._styleRepetition = newVal;
-        }
-    },
-    _styleCounter : {
-        value: 0
-    },
-    styleCounter:{
-        serializable:true,
-        get:function () {
-            return this._styleCounter;
-        },
-        set:function (newVal) {
-            this._styleCounter = newVal;
-        }
-    },
-    _selectedStyleIndex: {
-        value: false
-    },
-    selectedStyleIndex: {
-        get: function() {
-                return this._selectedStyleIndex;
-        },
-        set: function(newVal) {
-                if (typeof(newVal) === "undefined") {
-                        return;
-                }
-                if (newVal !== this._selectedStyleIndex) {
-                        this._selectedStyleIndex = newVal;
-                        this.layerData.selectedStyleIndex = newVal;
-                        this.needsDraw = true;
-                }
-        }
-    },
-
-    /* Layer models: the name, ID, and selected and animation booleans for the layer */
-    _layerName:{
-        value: ""
-    },
-    
-    layerName:{
-        serializable: true,
-        get:function(){
-            return this._layerName;
-        },
-        set:function(newVal){
-                        if (this._layerEditable.value !== newVal) {
-                                this._layerEditable.value = newVal;
-                        }
-                        if (this._layerName !== newVal) {
-                                this._layerName = newVal;
-                        }
-                        if (this.layerData.layerName !== newVal) {
-                                this.layerData.layerName = newVal;
-                        }
-
-                if (typeof(this.dynamicLayerName) !== "undefined") {
-                        if (this.dynamicLayerName.value !== newVal) {
-                                this.dynamicLayerName.value = newVal;
-                        }
-                }
-                this.needsDraw = true;
-        }
-    },
-    _layerID:{
-        value: "Default Layer ID"
-    },
-
-    layerID:{
-        serializable: true,
-        get:function(){
-            return this._layerID;
-        },
-        set:function(value){
-            this._layerID = value;
-            this.layerData.layerID = value;
-        }
-    },
-    _layerTag:{
-        value: "tag"
-    },
-    
-    layerTag:{
-        serializable: true,
-        get:function(){
-            return this._layerTag;
-        },
-        set:function(newVal){
-                this._layerTag = newVal;
-                this.layerData.layerTag = newVal;
-        }
-    },
-    _docUUID : {
-        value: null
-    },
-    docUUID : {
-        serializable: true,
-        get: function() {
-                return this._docUUID;
-        },
-        set: function(newVal) {
-                this._docUUID = newVal;
-        }
-    },
-    
-    _stageElement: {
-        value: null
-    },
-    
-    stageElement: {
-        get: function() {
-                return this._stageElement;
-        },
-        set: function(newVal) {
-                this._stageElement = newVal;
-                this.layerData.stageElement = newVal;
-        }
-    },
-    
-    
-    _elementsList : {
-        value: []
-    },
-    elementsList : {
-        serializable: true,
-        get: function() {
-                return this._elementsList;
-        },
-        set: function(newVal) {
-                this._elementsList = newVal;
-        }
-    },
-    
-    /* Position and Size hottext values */
-    _dtextPositionX : {
-        value:null
-    },
-
-    dtextPositionX:{
-        serializable: true,
-        get:function(){
-            return this._dtextPositionX;
-        },
-        set:function(value){
-                if (this._dtextPositionX !== value) {
-                        this._dtextPositionX = value;
-                        this.layerData.dtextPositionX = value;
-                }
-        }
-    },
-    
-    _dtextPositionY : {
-        value:null
-    },
-
-    dtextPositionY:{
-        serializable: true,
-        get:function(){
-            return this._dtextPositionY;
-        },
-        set:function(value){
-                if (this._dtextPositionY !== value) {
-                        this._dtextPositionY = value;
-                        this.layerData.dtextPositionY = value;
-                }
-            
-        }
-    },