diff options
author | hwc487 | 2012-06-13 14:04:09 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 14:04:09 -0700 |
commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/panels/Timeline/Track.reel | |
parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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:{ |