aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorKruti Shah2012-06-20 15:12:48 -0700
committerKruti Shah2012-06-20 15:12:48 -0700
commit1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch)
tree26ff4c6c5a94accfd5801f124244d3eef152a5c7 /js/panels/Timeline
parent1ce4bd7033a413c7697888e5712f278219d6d095 (diff)
parent782b66c783df4a9c36fa240cc77900e69b9130cf (diff)
downloadninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js.orig1057
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/.sass-cache/a26ed2cbe268f8c721d1b1d8dfa075c8c5b47e72/PropertyTrack.scsscbin5151 -> 0 bytes
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js42
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 @@
1/* <copyright>
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/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */
6
7var Montage = require("montage/core/core").Montage;
8var Component = require("montage/ui/component").Component;
9var Collapser = require("js/panels/Timeline/Collapser").Collapser;
10var Hintable = require("js/components/hintable.reel").Hintable;
11var LayerStyle = require("js/panels/Timeline/Style.reel").LayerStyle;
12var DynamicText = require("montage/ui/dynamic-text.reel").DynamicText;
13var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;
14var nj = require("js/lib/NJUtils").NJUtils;
15var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
16
17var Layer = exports.Layer = Montage.create(Component, {
18
19 hasTemplate:{
20 value: true
21 },
22
23 /* Begin: Models */
24
25 /* Main collapser model: the main collapser for the layer */
26 _mainCollapser : {
27 value: false
28 },
29 mainCollapser: {
30 get: function() {
31 return this._mainCollapser;
32 },
33 set: function(newVal) {
34 this._mainCollapser = newVal;
35 }
36 },
37
38 /* Style models: the array of styles, and the repetition that uses them */
39 _arrLayerStyles : {
40 value: []
41 },
42 arrLayerStyles : {
43 serializable: true,
44 get: function() {
45 return this._arrLayerStyles;
46 },
47 set: function(newVal) {
48 this._arrLayerStyles = newVal;
49 }
50 },
51 _styleRepetition : {
52 value: false
53 },
54 styleRepetition : {
55 serializable: true,
56 get: function() {
57 return this._styleRepetition;
58 },
59 set: function(newVal) {
60 this._styleRepetition = newVal;
61 }
62 },
63 _styleCounter : {
64 value: 0
65 },
66 styleCounter:{
67 serializable:true,
68 get:function () {
69 return this._styleCounter;
70 },
71 set:function (newVal) {
72 this._styleCounter = newVal;
73 }
74 },
75 _selectedStyleIndex: {
76 value: false
77 },
78 selectedStyleIndex: {
79 get: function() {
80 return this._selectedStyleIndex;
81 },
82 set: function(newVal) {
83 if (typeof(newVal) === "undefined") {
84 return;
85 }
86 if (newVal !== this._selectedStyleIndex) {
87 this._selectedStyleIndex = newVal;
88 this.layerData.selectedStyleIndex = newVal;
89 this.needsDraw = true;
90 }
91 }
92 },
93
94 /* Layer models: the name, ID, and selected and animation booleans for the layer */
95 _layerName:{
96 value: ""
97 },
98
99 layerName:{
100 serializable: true,
101 get:function(){
102 return this._layerName;
103 },
104 set:function(newVal){
105 if (this._layerEditable.value !== newVal) {
106 this._layerEditable.value = newVal;
107 }
108 if (this._layerName !== newVal) {
109 this._layerName = newVal;
110 }
111 if (this.layerData.layerName !== newVal) {
112 this.layerData.layerName = newVal;
113 }
114
115 if (typeof(this.dynamicLayerName) !== "undefined") {
116 if (this.dynamicLayerName.value !== newVal) {
117 this.dynamicLayerName.value = newVal;
118 }
119 }
120 this.needsDraw = true;
121 }
122 },
123 _layerID:{
124 value: "Default Layer ID"
125 },
126
127 layerID:{
128 serializable: true,
129 get:function(){
130 return this._layerID;
131 },
132 set:function(value){
133 this._layerID = value;
134 this.layerData.layerID = value;
135 }
136 },
137 _layerTag:{
138 value: "tag"
139 },
140
141 layerTag:{
142 serializable: true,
143 get:function(){
144 return this._layerTag;
145 },
146 set:function(newVal){
147 this._layerTag = newVal;
148 this.layerData.layerTag = newVal;
149 }
150 },
151 _docUUID : {
152 value: null
153 },
154 docUUID : {
155 serializable: true,
156 get: function() {
157 return this._docUUID;
158 },
159 set: function(newVal) {
160 this._docUUID = newVal;
161 }
162 },
163
164 _stageElement: {
165 value: null
166 },
167
168 stageElement: {
169 get: function() {
170 return this._stageElement;
171 },
172 set: function(newVal) {
173 this._stageElement = newVal;
174 this.layerData.stageElement = newVal;
175 }
176 },
177
178
179 _elementsList : {
180 value: []
181 },
182 elementsList : {
183 serializable: true,
184 get: function() {
185 return this._elementsList;
186 },
187 set: function(newVal) {
188 this._elementsList = newVal;
189 }
190 },
191
192 /* Position and Size hottext values */
193 _dtextPositionX : {
194 value:null
195 },
196
197 dtextPositionX:{
198 serializable: true,
199 get:function(){
200 return this._dtextPositionX;
201 },
202 set:function(value){
203 if (this._dtextPositionX !== value) {
204 this._dtextPositionX = value;
205 this.layerData.dtextPositionX = value;
206 }
207 }
208 },
209
210 _dtextPositionY : {
211 value:null
212 },
213
214 dtextPositionY:{
215 serializable: true,
216 get:function(){
217 return this._dtextPositionY;
218 },
219 set:function(value){
220 if (this._dtextPositionY !== value) {
221 this._dtextPositionY = value;
222 this.layerData.dtextPositionY = value;
223 }
224
225 }
226 },