diff options
| author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
| commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
| tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/Timeline/Track.reel/Track.js | |
| parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
| parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
| download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/panels/Timeline/Track.reel/Track.js')
| -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:{ |