aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
authorEric Guzman2012-04-30 13:48:43 -0700
committerEric Guzman2012-04-30 13:48:43 -0700
commit23d8efd4ed9e8fd43f516595009679fb44c8096d (patch)
tree7d5be06e6417102702a49ece24fca82528aced7a /js/panels/Timeline/TimelineTrack.reel
parentae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html40
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js236
2 files changed, 190 insertions, 86 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 7e9b8a21..44ad9abb 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "module": "js/panels/Timeline/TimelineTrack.reel", 14 "prototype": "js/panels/Timeline/TimelineTrack.reel[Track]",
15 "name": "Track",
16 "properties": { 15 "properties": {
17 "element": {"#": "track"}, 16 "element": {"#": "track"},
18 "tweenRepetition" : {"@" : "tweenRepetition"}, 17 "tweenRepetition" : {"@" : "tweenRepetition"},
@@ -26,8 +25,7 @@
26 }, 25 },
27 26
28 "tween" : { 27 "tween" : {
29 "module" : "js/panels/timeline/Tween.reel", 28 "prototype" : "js/panels/timeline/Tween.reel",
30 "name" : "Tween",
31 "properties" : { 29 "properties" : {
32 "element":{"#": "track_lane"} 30 "element":{"#": "track_lane"}
33 }, 31 },
@@ -41,8 +39,7 @@
41 }, 39 },
42 40
43 "tweenRepetition": { 41 "tweenRepetition": {
44 "module": "montage/ui/repetition.reel", 42 "prototype": "montage/ui/repetition.reel",
45 "name": "Repetition",
46 "properties": { 43 "properties": {
47 "element": {"#": "track_lanes"}, 44 "element": {"#": "track_lanes"},
48 "isSelectionEnabled" : false 45 "isSelectionEnabled" : false
@@ -57,8 +54,7 @@
57 }, 54 },
58 55
59 "styleTrackRepetition": { 56 "styleTrackRepetition": {
60 "module": "montage/ui/repetition.reel", 57 "prototype": "montage/ui/repetition.reel",
61 "name": "Repetition",
62 "properties": { 58 "properties": {
63 "element": {"#": "content-styles"}, 59 "element": {"#": "content-styles"},
64 "isSelectionEnabled" : false 60 "isSelectionEnabled" : false
@@ -72,8 +68,7 @@
72 } 68 }
73 }, 69 },
74 "positionTracksRepetition": { 70 "positionTracksRepetition": {
75 "module": "montage/ui/repetition.reel", 71 "prototype": "montage/ui/repetition.reel",
76 "name": "Repetition",
77 "properties": { 72 "properties": {
78 "element": {"#": "content-position-tracks"}, 73 "element": {"#": "content-position-tracks"},
79 "isSelectionEnabled" : false 74 "isSelectionEnabled" : false
@@ -87,15 +82,13 @@
87 } 82 }
88 }, 83 },
89 "positionPropertyTrack" : { 84 "positionPropertyTrack" : {
90 "module" : "js/panels/Timeline/PropertyTrack.reel", 85 "prototype" : "js/panels/Timeline/PropertyTrack.reel",
91 "name" : "PropertyTrack",
92 "properties" : { 86 "properties" : {
93 "element":{"#": "position-track-base"} 87 "element":{"#": "position-track-base"}
94 } 88 }
95 }, 89 },
96 "transformTracksRepetition": { 90 "transformTracksRepetition": {
97 "module": "montage/ui/repetition.reel", 91 "prototype": "montage/ui/repetition.reel",
98 "name": "Repetition",
99 "properties": { 92 "properties": {
100 "element": {"#": "content-transform-tracks"}, 93 "element": {"#": "content-transform-tracks"},
101 "isSelectionEnabled" : false 94 "isSelectionEnabled" : false
@@ -109,16 +102,14 @@
109 } 102 }
110 }, 103 },
111 "transformPropertyTrack" : { 104 "transformPropertyTrack" : {
112 "module" : "js/panels/Timeline/PropertyTrack.reel", 105 "prototype" : "js/panels/Timeline/PropertyTrack.reel",
113 "name" : "PropertyTrack",
114 "properties" : { 106 "properties" : {
115 "element":{"#": "transform-track-base"} 107 "element":{"#": "transform-track-base"}
116 } 108 }
117 }, 109 },
118 110
119 "mainCollapser" : { 111 "mainCollapser" : {
120 "module" : "js/panels/timeline/Collapser.js", 112 "prototype" : "js/panels/timeline/Collapser",
121 "name" : "Collapser",
122 "properties" : { 113 "properties" : {
123 "element" : {"#" : "content-main"}, 114 "element" : {"#" : "content-main"},
124 "myContent" : {"#":"content-main"}, 115 "myContent" : {"#":"content-main"},
@@ -143,8 +134,7 @@
143 }, 134 },
144 135
145 "positionCollapser" : { 136 "positionCollapser" : {
146 "module" : "js/panels/timeline/Collapser.js", 137 "prototype" : "js/panels/timeline/Collapser",
147 "name" : "Collapser",
148 "properties" : { 138 "properties" : {
149 "element" : {"#" : "content-position-tracks"}, 139 "element" : {"#" : "content-position-tracks"},
150 "myContent" : {"#":"content-position-tracks"}, 140 "myContent" : {"#":"content-position-tracks"},
@@ -169,8 +159,7 @@
169 }, 159 },
170 160
171 "transformCollapser" : { 161 "transformCollapser" : {
172 "module" : "js/panels/timeline/Collapser.js", 162 "prototype" : "js/panels/timeline/Collapser",
173 "name" : "Collapser",
174 "properties" : { 163 "properties" : {
175 "element" : {"#" : "content-transform-tracks"}, 164 "element" : {"#" : "content-transform-tracks"},
176 "myContent" : {"#":"content-transform-tracks"}, 165 "myContent" : {"#":"content-transform-tracks"},
@@ -195,12 +184,11 @@
195 }, 184 },
196 185
197 "styleCollapser" : { 186 "styleCollapser" : {
198 "module" : "js/panels/timeline/Collapser.js", 187 "prototype" : "js/panels/timeline/Collapser",
199 "name" : "Collapser",
200 "properties" : { 188 "properties" : {
201 "element" : {"#" : "content-styles"}, 189 "element" : {"#" : "content-styles"},
202 "myContent" : {"#":"content-styles"}, 190 "myContent" : {"#":"content-styles"},
203 "contentHeight" : 40, 191 "contentHeight" : 0,
204 "isLabelClickable" : false, 192 "isLabelClickable" : false,
205 "clicker" : {"#" : "label-styles"}, 193 "clicker" : {"#" : "label-styles"},
206 "isCollapsed" : true, 194 "isCollapsed" : true,
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index c6b67c9c..e46a5eb0 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -26,8 +26,32 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
26 return this._trackID; 26 return this._trackID;
27 }, 27 },
28 set:function (value) { 28 set:function (value) {
29 this._trackID = value; 29 if (value !== this._trackID) {
30 //this.needsDraw = true; 30 this._trackID = value;
31 this.trackData.layerID = value;
32 }
33 }
34 },
35 _isVisible:{
36 value: true
37 },
38
39 isVisible:{
40 get:function(){
41 return this._isVisible;
42 },
43 set:function(value){
44 if (this._isVisible !== value) {
45 this._isVisible = value;
46 if (this.element !== null) {
47 if (value === true) {
48 this.element.classList.remove("layer-hidden");
49