aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-27 14:26:41 -0700
committerValerio Virgillito2012-04-27 14:26:41 -0700
commitc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (patch)
tree39fe2ff0cadd444b440310db444c90d9800fb0c1 /js/panels
parentb08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (diff)
downloadninja-c8fac64d4ad8ac18744a17a5e0f0d17204355fd6.tar.gz
Merge cleanup
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html3
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html3
2 files changed, 2 insertions, 4 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index bec033f8..10334b31 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -41,8 +41,7 @@
41 } 41 }
42 }, 42 },
43 "dtext2" : { 43 "dtext2" : {
44 "module" : "montage/ui/dynamic-text.reel", 44 "prototype" : "montage/ui/dynamic-text.reel",
45 "name" : "DynamicText",
46 "properties" : { 45 "properties" : {
47 "element" : {"#" : "layer-tag"} 46 "element" : {"#" : "layer-tag"}
48 }, 47 },
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index f821ba6f..f10e9ac9 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -119,8 +119,7 @@
119 }, 119 },
120 120
121 "timelineZoomSlider":{ 121 "timelineZoomSlider":{
122 "module":"js/components/slider.reel", 122 "prototype":"js/components/slider.reel",
123 "name":"Slider",
124 "properties":{ 123 "properties":{
125 "element":{"#":"tl_slider"}, 124 "element":{"#":"tl_slider"},
126 "maxValue" : 10000, 125 "maxValue" : 10000,