aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Track.reel/Track.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/Timeline/Track.reel/Track.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels/Timeline/Track.reel/Track.html')
-rw-r--r--js/panels/Timeline/Track.reel/Track.html17
1 files changed, 7 insertions, 10 deletions
diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html
index 39b387e2..0f0c7c9c 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
@@ -56,9 +53,9 @@
56 </head> 53 </head>
57 <body> 54 <body>
58 55
59 <div id="track"> 56 <div data-montage-id="track">
60 <div id="track_lanes"> 57 <div data-montage-id="track_lanes">
61 <div id="track_lane" class="tracklane"></div> 58 <div data-montage-id="track_lane" class="tracklane"></div>
62 </div> 59 </div>
63 </div> 60 </div>
64 61