diff options
| author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
| commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
| tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/Timeline/Track.reel | |
| parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
| parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
| download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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:{ |