aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Track.reel/Track.html
diff options
context:
space:
mode:
authorAnanya Sen2012-05-01 13:39:30 -0700
committerAnanya Sen2012-05-01 13:39:30 -0700
commitc360d1a5cfe894591ae65f892ead11d0ca537b18 (patch)
tree13964f810d3516dbc02e27ab5bb576fe62366f26 /js/panels/Timeline/Track.reel/Track.html
parent3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff)
parente3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff)
downloadninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/panels/Timeline/Track.reel/Track.html')
-rw-r--r--js/panels/Timeline/Track.reel/Track.html11
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