diff options
| author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
| commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
| tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/panels/Timeline/Track.reel | |
| parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/Timeline/Track.reel')
| -rw-r--r-- | js/panels/Timeline/Track.reel/Track.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/panels/Timeline/Track.reel/Track.js b/js/panels/Timeline/Track.reel/Track.js index 8c52199a..2ef760b7 100644 --- a/js/panels/Timeline/Track.reel/Track.js +++ b/js/panels/Timeline/Track.reel/Track.js | |||
| @@ -10,8 +10,9 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve | |||
| 10 | 10 | ||
| 11 | var Track = exports.Track = Montage.create(Component, { | 11 | var Track = exports.Track = Montage.create(Component, { |
| 12 | 12 | ||
| 13 | hasTemplate:{ | 13 | track_lane: { |
| 14 | value: true | 14 | value: null, |
| 15 | serializable: true | ||
| 15 | }, | 16 | }, |
| 16 | 17 | ||
| 17 | _trackID:{ | 18 | _trackID:{ |