aboutsummaryrefslogtreecommitdiff
path: root/js/components/slider.reel/slider.js
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/components/slider.reel/slider.js
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/slider.reel/slider.js')
-rwxr-xr-xjs/components/slider.reel/slider.js15
1 files changed, 15 insertions, 0 deletions
diff --git a/js/components/slider.reel/slider.js b/js/components/slider.reel/slider.js
index fced8aad..b2af1f9a 100755
--- a/js/components/slider.reel/slider.js
+++ b/js/components/slider.reel/slider.js
@@ -9,6 +9,21 @@ var SliderBase = require("js/components/sliderbase").SliderBase;
9 9
10var Slider = exports.Slider = Montage.create(SliderBase, { 10var Slider = exports.Slider = Montage.create(SliderBase, {
11 11
12 parentDiv: {
13 value: null,
14 serializable: true
15 },
16
17 track: {
18 value: null,
19 serializable: true
20 },
21
22 knob: {
23 value: null,
24 serializable: true
25 },
26
12 // "horizontal" or "vertical" 27 // "horizontal" or "vertical"
13 _direction: { 28 _direction: {
14 enumerable: true, 29 enumerable: true,