Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 1409 insertions, 1338 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index f7b66a39..291e3416 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -1,1339 +1,1410 @@
-/* <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 Hintable = require("js/components/hintable.reel").Hintable;

-var nj = require("js/lib/NJUtils").NJUtils;

-var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;

-

-var Layer = exports.Layer = Montage.create(Component, {

-    

-    /* Begin: Models */

-

-        _dynamicLayerTag: {

-                value: null

-        },

-    dynamicLayerTag: {

-        serializable: true,

-        get: function() {

-                return this._dynamicLayerTag;

-        },

-        set: function(newVal) {

-                this._dynamicLayerTag = newVal;

-        }

-    },

-

-        _positionCollapser: {

-                value: null

-        },

-    positionCollapser: {

-        serializable: true,

-        get: function() {

-                return this._positionCollapser;

-        },

-        set: function(newVal) {

-                this._positionCollapser = newVal;

-        }

-    },

-

-        _transformCollapser: {

-                value: null

-        },

-    transformCollapser: {

-        serializable: true,

-        get: function() {

-                return this._transformCollapser;

-        },

-        set: function(newVal) {

-                this._transformCollapser = newVal;

-        }

-    },

-

-        _styleCollapser: {

-                value: null

-        },

-    styleCollapser: {

-        serializable: true,

-        get: function() {

-                return this._styleCollapser;

-        },

-        set: function(newVal) {

-                this._styleCollapser = newVal;

-        }

-    },

-

-        _clickerMain: {

-                value: null

-        },

-    clickerMain: {

-        serializable: true,

-        get: function() {

-                return this._clickerMain;

-        },

-        set: function(newVal) {

-                this._clickerMain = newVal;

-        }

-    },

-

-        _myLabel: {

-                value: null

-        },

-    myLabel: {

-        serializable: true,

-        get: function() {

-                return this._myLabel;

-        },

-        set: function(newVal) {

-                this._myLabel = newVal;

-        }

-    },

-   

-    _mainCollapser : {

-        value: false

-    },

-    mainCollapser: {

-        get: function() {

-                return this._mainCollapser;

-        },

-        set: function(newVal) {

-                this._mainCollapser = newVal;

-        },

-        serializable: true

-    },

-    

-    _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;

-        }

-    },

+/* <copyright>
+Copyright (c) 2012, Motorola Mobility, Inc
+All Rights Reserved.
+BSD License.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+  - Neither the name of Motorola Mobility nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</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, {
+
+    dynamicLayerTag: {
+        value: null,
+        serializable: true
+    },
+
+    positionCollapser: {
+        value: null,
+        serializable: true
+    },
+
+    transformCollapser: {
+        value: null,
+        serializable: true
+    },
+
+    styleCollapser: {
+        value: null,
+        serializable: true
+    },
+
+    clickerMain: {
+        value: null,
+        serializable: true
+    },
+
+    myLabel: {
+        value: null,
+        serializable: 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;
+        },
+        serializable: true
+    },
+    
+    /* 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;
+                }
+        }
+    },
+    _storedStyleIndex : {
+        value: false
+    },