diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/slider.reel | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/slider.reel')
-rwxr-xr-x | js/components/slider.reel/slider.js | 15 |
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 | ||
10 | var Slider = exports.Slider = Montage.create(SliderBase, { | 10 | var 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, |