diff options
| author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
| commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
| tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/panels/Timeline/Track.reel/Track.js | |
| parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
| parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
| download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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:{ |