diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/panels/Timeline/Track.reel | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/panels/Timeline/Track.reel')
| -rw-r--r-- | js/panels/Timeline/Track.reel/Track.html | 6 | ||||
| -rw-r--r-- | js/panels/Timeline/Track.reel/Track.js | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html index 9c72f430..0f0c7c9c 100644 --- a/js/panels/Timeline/Track.reel/Track.html +++ b/js/panels/Timeline/Track.reel/Track.html | |||
| @@ -53,9 +53,9 @@ | |||
| 53 | </head> | 53 | </head> |
| 54 | <body> | 54 | <body> |
| 55 | 55 | ||
| 56 | <div id="track"> | 56 | <div data-montage-id="track"> |
| 57 | <div id="track_lanes"> | 57 | <div data-montage-id="track_lanes"> |
| 58 | <div id="track_lane" class="tracklane"></div> | 58 | <div data-montage-id="track_lane" class="tracklane"></div> |
| 59 | </div> | 59 | </div> |
| 60 | </div> | 60 | </div> |
| 61 | 61 | ||
diff --git a/js/panels/Timeline/Track.reel/Track.js b/js/panels/Timeline/Track.reel/Track.js index cfc2541b..8c52199a 100644 --- a/js/panels/Timeline/Track.reel/Track.js +++ b/js/panels/Timeline/Track.reel/Track.js | |||
| @@ -15,9 +15,7 @@ var Track = exports.Track = Montage.create(Component, { | |||
| 15 | }, | 15 | }, |
| 16 | 16 | ||
| 17 | _trackID:{ | 17 | _trackID:{ |
| 18 | value:null, | 18 | value:null |
| 19 | writable:true, | ||
| 20 | enumerable:true | ||
| 21 | }, | 19 | }, |
| 22 | 20 | ||
| 23 | trackID:{ | 21 | trackID:{ |
| @@ -30,7 +28,6 @@ var Track = exports.Track = Montage.create(Component, { | |||
| 30 | }, | 28 | }, |
| 31 | 29 | ||
| 32 | _spans:{ | 30 | _spans:{ |
| 33 | serializable:true, | ||
| 34 | value:[] | 31 | value:[] |
| 35 | }, | 32 | }, |
| 36 | 33 | ||
| @@ -45,12 +42,10 @@ var Track = exports.Track = Montage.create(Component, { | |||
| 45 | }, | 42 | }, |
| 46 | 43 | ||
| 47 | _spanRepetition:{ | 44 | _spanRepetition:{ |
| 48 | serializable:true, | ||
| 49 | value:null | 45 | value:null |
| 50 | }, | 46 | }, |
| 51 | 47 | ||
| 52 | spanRepetition:{ | 48 | spanRepetition:{ |
| 53 | serializable:true, | ||
| 54 | get:function () { | 49 | get:function () { |
| 55 | return this._spanRepetition; | 50 | return this._spanRepetition; |
| 56 | }, | 51 | }, |
| @@ -85,9 +80,8 @@ var Track = exports.Track = Montage.create(Component, { | |||
| 85 | 80 | ||
| 86 | //TEMP | 81 | //TEMP |
| 87 | keyFrames:{ | 82 | keyFrames:{ |
| 88 | value:[], | 83 | serializable: true, |
| 89 | writable:true, | 84 | value:[] |
| 90 | enumerable:true | ||
| 91 | }, | 85 | }, |
| 92 | 86 | ||
| 93 | prepareForDraw: { | 87 | prepareForDraw: { |