diff options
author | Valerio Virgillito | 2012-04-26 17:09:12 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-26 17:09:12 -0700 |
commit | 7968f3a9cf56392c914d6bd44cc90145b6d807a3 (patch) | |
tree | b632e72735c9a071078121be07cf8cba2ebf29cc /js/panels/Timeline/Track.reel/Track.html | |
parent | b03c3b087297f471840ab8595d5aa8bd0249a742 (diff) | |
parent | bcfb200482c26b2bfc0d6577b1eb0de7a19a6762 (diff) | |
download | ninja-7968f3a9cf56392c914d6bd44cc90145b6d807a3.tar.gz |
Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization
Diffstat (limited to 'js/panels/Timeline/Track.reel/Track.html')
-rw-r--r-- | js/panels/Timeline/Track.reel/Track.html | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html index 39b387e2..9c72f430 100644 --- a/js/panels/Timeline/Track.reel/Track.html +++ b/js/panels/Timeline/Track.reel/Track.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -11,8 +11,7 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "module": "js/panels/Timeline/Track.reel", | 14 | "prototype": "js/panels/Timeline/Track.reel", |
15 | "name": "Track", | ||
16 | "properties": { | 15 | "properties": { |
17 | "element": {"#": "track"}, | 16 | "element": {"#": "track"}, |
18 | "spanRepetition" : {"@" : "spanRepetition"}, | 17 | "spanRepetition" : {"@" : "spanRepetition"}, |
@@ -21,8 +20,7 @@ | |||
21 | }, | 20 | }, |
22 | 21 | ||
23 | "trackslot": { | 22 | "trackslot": { |
24 | "module": "montage/ui/slot.reel", | 23 | "prototype": "montage/ui/slot.reel", |
25 | "name": "Slot", | ||
26 | "properties": { | 24 | "properties": { |
27 | "element": {"#": "track_lane"} | 25 | "element": {"#": "track_lane"} |
28 | }, | 26 | }, |
@@ -36,8 +34,7 @@ | |||
36 | }, | 34 | }, |
37 | 35 | ||
38 | "spanRepetition": { | 36 | "spanRepetition": { |
39 | "module": "montage/ui/repetition.reel", | 37 | "prototype": "montage/ui/repetition.reel", |
40 | "name": "Repetition", | ||
41 | "properties": { | 38 | "properties": { |
42 | "element": {"#": "track_lanes"}, | 39 | "element": {"#": "track_lanes"}, |
43 | "isSelectionEnabled" : true | 40 | "isSelectionEnabled" : true |