aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-26 17:09:12 -0700
committerValerio Virgillito2012-04-26 17:09:12 -0700
commit7968f3a9cf56392c914d6bd44cc90145b6d807a3 (patch)
treeb632e72735c9a071078121be07cf8cba2ebf29cc /js/panels/Timeline/TimelinePanel.reel
parentb03c3b087297f471840ab8595d5aa8bd0249a742 (diff)
parentbcfb200482c26b2bfc0d6577b1eb0de7a19a6762 (diff)
downloadninja-7968f3a9cf56392c914d6bd44cc90145b6d807a3.tar.gz
Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html23
1 files changed, 8 insertions, 15 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 14c5f1c8..daeb9a3c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.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/>
@@ -13,8 +13,7 @@
13 <script type="text/montage-serialization"> 13 <script type="text/montage-serialization">
14 { 14 {
15 "owner": { 15 "owner": {
16 "module": "js/panels/Timeline/TimelinePanel.reel", 16 "prototype": "js/panels/Timeline/TimelinePanel.reel",
17 "name": "TimelinePanel",
18 "properties": { 17 "properties": {
19 "element": {"#": "timeline_panel"}, 18 "element": {"#": "timeline_panel"},
20 "user_layers": {"#": "user_layers"}, 19 "user_layers": {"#": "user_layers"},
@@ -39,8 +38,7 @@
39 }, 38 },
40 39
41 "timelineResize" : { 40 "timelineResize" : {
42 "module": "js/panels/Resizer", 41 "prototype": "js/panels/Resizer",
43 "name": "Resizer",
44 "properties": { 42 "properties": {
45 "element": {"#": "layer_resizer"}, 43 "element": {"#": "layer_resizer"},
46 "panel" : {"#" : "timeline_leftpane"}, 44 "panel" : {"#" : "timeline_leftpane"},
@@ -52,8 +50,7 @@
52 50
53 51
54 "repetition1": { 52 "repetition1": {
55 "module": "montage/ui/repetition.reel", 53 "prototype": "montage/ui/repetition.reel",
56 "name": "Repetition",
57 "properties": { 54 "properties": {
58 "element": {"#": "container-layers"}, 55 "element": {"#": "container-layers"},
59 "isSelectionEnabled" : true 56 "isSelectionEnabled" : true
@@ -67,8 +64,7 @@
67 } 64 }
68 }, 65 },
69 "layer" : { 66 "layer" : {
70 "module" : "js/panels/Timeline/Layer.reel", 67 "prototype" : "js/panels/Timeline/Layer.reel",
71 "name" : "Layer",
72 "properties" : { 68 "properties" : {
73 "element": {"#": "container-layer"} 69 "element": {"#": "container-layer"}
74 }, 70 },
@@ -82,8 +78,7 @@
82 }, 78 },
83 79
84 "repetition2" : { 80 "repetition2" : {
85 "module": "montage/ui/repetition.reel", 81 "prototype": "montage/ui/repetition.reel",
86 "name": "Repetition",
87 "properties": { 82 "properties": {
88 "element": {"#": "container-tracks"}, 83 "element": {"#": "container-tracks"},
89 "isSelectionEnabled" : false 84 "isSelectionEnabled" : false
@@ -97,8 +92,7 @@
97 } 92 }
98 }, 93 },
99 "track" : { 94 "track" : {
100 "module" : "js/panels/Timeline/TimelineTrack.reel", 95 "prototype" : "js/panels/Timeline/TimelineTrack.reel",
101 "name" : "TimelineTrack",
102 "properties" : { 96 "properties" : {
103 "element": {"#": "container-track"} 97 "element": {"#": "container-track"}
104 }, 98 },
@@ -111,8 +105,7 @@
111 } 105 }
112 }, 106 },
113 "endHottext" : { 107 "endHottext" : {
114 "module": "js/components/hottextunit.reel", 108 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
115 "name": "HotTextUnit",
116 "properties": { 109 "properties": {
117 "element": {"#": "end_hottext"}, 110 "element": {"#": "end_hottext"},
118 "maxValue" : 100000, 111 "maxValue" : 100000,