aboutsummaryrefslogtreecommitdiff
path: root/js/components/slider.reel
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:04:09 -0700
committerhwc4872012-06-13 14:04:09 -0700
commit3e481dd581e0305dd8b572ed0d17e86622223464 (patch)
treeaca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/components/slider.reel
parenta7aa51e6b91623772eef54b827616432838b560e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/slider.reel')
-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,