From c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 27 Apr 2012 14:26:41 -0700 Subject: Merge cleanup Signed-off-by: Valerio Virgillito --- js/panels/Timeline/Layer.reel/Layer.html | 3 +-- js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'js/panels') 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 @@ } }, "dtext2" : { - "module" : "montage/ui/dynamic-text.reel", - "name" : "DynamicText", + "prototype" : "montage/ui/dynamic-text.reel", "properties" : { "element" : {"#" : "layer-tag"} }, 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 @@ }, "timelineZoomSlider":{ - "module":"js/components/slider.reel", - "name":"Slider", + "prototype":"js/components/slider.reel", "properties":{ "element":{"#":"tl_slider"}, "maxValue" : 10000, -- cgit v1.2.3