2 files changed, 1412 insertions, 1426 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 4dd9e88a..f7b66a39 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -1,1372 +1,1339 @@
-/* <copyright>
+/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ 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/>
+ 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.
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
+ </copyright> */
-var Montage = require("montage/core/core").Montage;
+var Montage = require("montage/core/core").Montage;
-var Component = require("montage/ui/component").Component;
+var Component = require("montage/ui/component").Component;
-var Collapser = require("js/panels/Timeline/Collapser").Collapser;
+var Hintable = require("js/components/hintable.reel").Hintable;
-var Hintable = require("js/components/hintable.reel").Hintable;
+var nj = require("js/lib/NJUtils").NJUtils;
-var LayerStyle = require("js/panels/Timeline/Style.reel").LayerStyle;
+var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
-var DynamicText = require("montage/ui/dynamic-text.reel").DynamicText;
-var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;
+var Layer = exports.Layer = Montage.create(Component, {
-var nj = require("js/lib/NJUtils").NJUtils;
+    
-var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
+    /* Begin: Models */
-var Layer = exports.Layer = Montage.create(Component, {
+        _dynamicLayerTag: {
+                value: null
-    dynamicLayerTag: {
+        },
-        value: null,
+    dynamicLayerTag: {
-        serializable: true
+        serializable: true,
-    },
+        get: function() {
+                return this._dynamicLayerTag;
-    positionCollapser: {
+        },
-        value: null,
+        set: function(newVal) {
-        serializable: true
+                this._dynamicLayerTag = newVal;
-    },
+        }
+    },
-    transformCollapser: {
-        value: null,
+        _positionCollapser: {
-        serializable: true
+                value: null
-    },
+        },
+    positionCollapser: {
-    styleCollapser: {
+        serializable: true,
-        value: null,
+        get: function() {
-        serializable: true
+                return this._positionCollapser;
-    },
+        },
+        set: function(newVal) {
-    clickerMain: {
+                this._positionCollapser = newVal;
-        value: null,
+        }
-        serializable: true
+    },
-    },
+        _transformCollapser: {
-    myLabel: {
+                value: null
-        value: null,
+        },
-        serializable: true
+    transformCollapser: {
-    },
+        serializable: true,
-    
+        get: function() {
-    /* Begin: Models */
+                return this._transformCollapser;
-   
+        },
-        /* Main collapser model: the main collapser for the layer */
+        set: function(newVal) {
-    _mainCollapser : {
+                this._transformCollapser = newVal;
-        value: false
+        }
-    },
+    },
-    mainCollapser: {
-        get: function() {
+        _styleCollapser: {
-                return this._mainCollapser;
+                value: null
-        },
+        },
-        set: function(newVal) {
+    styleCollapser: {
-                this._mainCollapser = newVal;
+        serializable: true,
-        },
+        get: function() {
-        serializable: true
+                return this._styleCollapser;
-    },
+        },
-    
+        set: function(newVal) {
-    /* Style models: the array of styles, and the repetition that uses them */
+                this._styleCollapser = newVal;
-    _arrLayerStyles : {
+        }
-            value: []
+    },
-    },
-    arrLayerStyles : {
+        _clickerMain: {
-        serializable: true,
+                value: null
-        get: function() {
+        },
-                return this._arrLayerStyles;
+    clickerMain: {
-        },
+        serializable: true,
-        set: function(newVal) {
+        get: function() {
-                this._arrLayerStyles = newVal;
+                return this._clickerMain;
-        }
+        },
-    },
+        set: function(newVal) {
-    _styleRepetition : {
+                this._clickerMain = newVal;
-        value: false
+        }
-    },
+    },
-    styleRepetition : {
-        serializable: true,
+        _myLabel: {
-        get: function() {
+                value: null
-                return this._styleRepetition;
+        },
-        },
+    myLabel: {
-        set: function(newVal) {
+        serializable: true,
-                this._styleRepetition = newVal;
+        get: function() {
-        }
+                return this._myLabel;
-    },
+        },
-    _styleCounter : {
+        set: function(newVal) {
-        value: 0
+                this._myLabel = newVal;
-    },
+        }
-    styleCounter:{
+    },
-        serializable:true,
+   
-        get:function () {
+    _mainCollapser : {
-            return this._styleCounter;
+        value: false
-        },
+    },
-        set:function (newVal) {
+    mainCollapser: {
-            this._styleCounter = newVal;
+        get: function() {
-        }
+                return this._mainCollapser;
-    },
+        },
-    _selectedStyleIndex: {
+        set: function(newVal) {
-        value: false
+                this._mainCollapser = newVal;
-    },
+        },
-    selectedStyleIndex: {
+        serializable: true
-        get: function() {
+    },
-                return this._selectedStyleIndex;
+    
-        },
+    _arrLayerStyles : {
-        set: function(newVal) {
+            value: []
-                if (typeof(newVal) === "undefined") {
+    },
-                        return;
+    arrLayerStyles : {
-                }
+        serializable: true,
-                if (newVal !== this._selectedStyleIndex) {
+        get: function() {
-                        this._selectedStyleIndex = newVal;
+                return this._arrLayerStyles;
-                        this.layerData.selectedStyleIndex = newVal;
+        },
-                }
+        set: function(newVal) {
-        }
+                this._arrLayerStyles = newVal;
-    },
+        }
-    _storedStyleIndex : {
+    },
-        value: false
+    
-    },
+    _styleRepetition : {
+        value: false
-    /* Layer models: the name, ID, and selected and animation booleans for the layer */
+    },
-    _layerName:{
+    styleRepetition : {
-        value: ""
+        serializable: true,
-    },
+        get: function() {
-    
+                return this._styleRepetition;
-    layerName:{
+        },
-        serializable: true,
+        set: function(newVal) {
-        get:function(){
+                this._styleRepetition = newVal;
-            return this._layerName;
+        }
-        },
+    },
-        set:function(newVal){
+    
-                        if (this._layerEditable.value !== newVal) {
+    _styleCounter : {
-                                this._layerEditable.value = newVal;
+        value: 0
-                        }
+    },
-                        if (this._layerName !== newVal) {
+    styleCounter:{
-                                this._layerName = newVal;
+        serializable:true,
-                        }
+        get:function () {
-                        if (this.layerData.layerName !== newVal) {
+            return this._styleCounter;
-                                this.layerData.layerName = newVal;
+        },
-                        }
+        set:function (newVal) {
+            this._styleCounter = newVal;
-                if (typeof(this.dynamicLayerName) !== "undefined") {
+        }
-                        if (this.dynamicLayerName.value !== newVal) {
+    },
-                                this.dynamicLayerName.value = newVal;
+    
-                        }
+    _selectedStyleIndex: {
-                }
+        value: false
-                this.needsDraw = true;
+    },
-        }
+    selectedStyleIndex: {
-    },

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 4dd9e88a..f7b66a39 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -1,1372 +1,1339 @@
1	/* <copyright>	1	/* <copyright>
2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>	2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>	3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */	5	</copyright> */
6		6
7	var Montage = require("montage/core/core").Montage;	7	var Montage = require("montage/core/core").Montage;
8	var Component = require("montage/ui/component").Component;	8	var Component = require("montage/ui/component").Component;
9	var Collapser = require("js/panels/Timeline/Collapser").Collapser;	9	var Hintable = require("js/components/hintable.reel").Hintable;
10	var Hintable = require("js/components/hintable.reel").Hintable;	10	var nj = require("js/lib/NJUtils").NJUtils;
11	var LayerStyle = require("js/panels/Timeline/Style.reel").LayerStyle;	11	var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
12	var DynamicText = require("montage/ui/dynamic-text.reel").DynamicText;	12
13	var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;	13	var Layer = exports.Layer = Montage.create(Component, {
14	var nj = require("js/lib/NJUtils").NJUtils;	14
15	var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;	15	/* Begin: Models */
16		16
17	var Layer = exports.Layer = Montage.create(Component, {	17	_dynamicLayerTag: {
18		18	value: null
19	dynamicLayerTag: {	19	},
20	value: null,	20	dynamicLayerTag: {
21	serializable: true	21	serializable: true,
22	},	22	get: function() {
23		23	return this._dynamicLayerTag;
24	positionCollapser: {	24	},
25	value: null,	25	set: function(newVal) {
26	serializable: true	26	this._dynamicLayerTag = newVal;
27	},	27	}
28		28	},
29	transformCollapser: {	29
30	value: null,	30	_positionCollapser: {
31	serializable: true	31	value: null
32	},	32	},
33		33	positionCollapser: {
34	styleCollapser: {	34	serializable: true,
35	value: null,	35	get: function() {
36	serializable: true	36	return this._positionCollapser;
37	},	37	},
38		38	set: function(newVal) {
39	clickerMain: {	39	this._positionCollapser = newVal;
40	value: null,	40	}
41	serializable: true	41	},
42	},	42
43		43	_transformCollapser: {
44	myLabel: {	44	value: null
45	value: null,	45	},
46	serializable: true	46	transformCollapser: {
47	},	47	serializable: true,
48		48	get: function() {
49	/* Begin: Models */	49	return this._transformCollapser;
50		50	},
51	/* Main collapser model: the main collapser for the layer */	51	set: function(newVal) {
52	_mainCollapser : {	52	this._transformCollapser = newVal;
53	value: false	53	}
54	},	54	},
55	mainCollapser: {	55
56	get: function() {	56	_styleCollapser: {
57	return this._mainCollapser;	57	value: null
58	},	58	},
59	set: function(newVal) {	59	styleCollapser: {
60	this._mainCollapser = newVal;	60	serializable: true,
61	},	61	get: function() {
62	serializable: true	62	return this._styleCollapser;
63	},	63	},
64		64	set: function(newVal) {
65	/* Style models: the array of styles, and the repetition that uses them */	65	this._styleCollapser = newVal;
66	_arrLayerStyles : {	66	}
67	value: []	67	},
68	},	68
69	arrLayerStyles : {	69	_clickerMain: {
70	serializable: true,	70	value: null
71	get: function() {	71	},
72	return this._arrLayerStyles;	72	clickerMain: {
73	},	73	serializable: true,
74	set: function(newVal) {	74	get: function() {
75	this._arrLayerStyles = newVal;	75	return this._clickerMain;
76	}	76	},
77	},	77	set: function(newVal) {
78	_styleRepetition : {	78	this._clickerMain = newVal;
79	value: false	79	}
80	},	80	},
81	styleRepetition : {	81
82	serializable: true,	82	_myLabel: {
83	get: function() {	83	value: null
84	return this._styleRepetition;	84	},
85	},	85	myLabel: {
86	set: function(newVal) {	86	serializable: true,
87	this._styleRepetition = newVal;	87	get: function() {
88	}	88	return this._myLabel;
89	},	89	},
90	_styleCounter : {	90	set: function(newVal) {
91	value: 0	91	this._myLabel = newVal;
92	},	92	}
93	styleCounter:{	93	},
94	serializable:true,	94
95	get:function () {	95	_mainCollapser : {
96	return this._styleCounter;	96	value: false
97	},	97	},
98	set:function (newVal) {	98	mainCollapser: {
99	this._styleCounter = newVal;	99	get: function() {
100	}	100	return this._mainCollapser;
101	},	101	},
102	_selectedStyleIndex: {	102	set: function(newVal) {
103	value: false	103	this._mainCollapser = newVal;
104	},	104	},
105	selectedStyleIndex: {	105	serializable: true
106	get: function() {	106	},
107	return this._selectedStyleIndex;	107
108	},	108	_arrLayerStyles : {
109	set: function(newVal) {	109	value: []
110	if (typeof(newVal) === "undefined") {	110	},
111	return;	111	arrLayerStyles : {
112	}	112	serializable: true,
113	if (newVal !== this._selectedStyleIndex) {	113	get: function() {
114	this._selectedStyleIndex = newVal;	114	return this._arrLayerStyles;
115	this.layerData.selectedStyleIndex = newVal;	115	},
116	}	116	set: function(newVal) {
117	}	117	this._arrLayerStyles = newVal;
118	},	118	}
119	_storedStyleIndex : {	119	},
120	value: false	120
121	},	121	_styleRepetition : {
122		122	value: false
123	/* Layer models: the name, ID, and selected and animation booleans for the layer */	123	},
124	_layerName:{	124	styleRepetition : {
125	value: ""	125	serializable: true,
126	},	126	get: function() {
127		127	return this._styleRepetition;
128	layerName:{	128	},
129	serializable: true,	129	set: function(newVal) {
130	get:function(){	130	this._styleRepetition = newVal;
131	return this._layerName;	131	}
132	},	132	},
133	set:function(newVal){	133
134	if (this._layerEditable.value !== newVal) {	134	_styleCounter : {
135	this._layerEditable.value = newVal;	135	value: 0
136	}	136	},
137	if (this._layerName !== newVal) {	137	styleCounter:{
138	this._layerName = newVal;	138	serializable:true,
139	}	139	get:function () {
140	if (this.layerData.layerName !== newVal) {	140	return this._styleCounter;
141	this.layerData.layerName = newVal;	141	},
142	}	142	set:function (newVal) {
143		143	this._styleCounter = newVal;
144	if (typeof(this.dynamicLayerName) !== "undefined") {	144	}
145	if (this.dynamicLayerName.value !== newVal) {	145	},
146	this.dynamicLayerName.value = newVal;	146
147	}	147	_selectedStyleIndex: {
148	}	148	value: false
149	this.needsDraw = true;	149	},
150	}	150	selectedStyleIndex: {
151	},