aboutsummaryrefslogtreecommitdiff
path: root/js/components/slider.reel/slider.js
diff options
context:
space:
mode:
authorAnanya Sen2012-06-19 11:00:49 -0700
committerAnanya Sen2012-06-19 11:00:49 -0700
commitf1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch)
tree31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/components/slider.reel/slider.js
parent9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
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,