diff options
| author | Valerio Virgillito | 2012-04-27 14:26:41 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-04-27 14:26:41 -0700 |
| commit | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (patch) | |
| tree | 39fe2ff0cadd444b440310db444c90d9800fb0c1 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
| parent | b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (diff) | |
| download | ninja-c8fac64d4ad8ac18744a17a5e0f0d17204355fd6.tar.gz | |
Merge cleanup
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 3 |
1 files changed, 1 insertions, 2 deletions
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, |