diff options
| author | Jose Antonio Marquez | 2012-06-13 14:03:00 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-13 14:03:00 -0700 |
| commit | efbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch) | |
| tree | 50565e097fe4a9db59e554af179f66938fa59f1c /js/panels/Timeline/Track.reel | |
| parent | ae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
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:{ |