aboutsummaryrefslogtreecommitdiff
path: root/js/components/slider.reel/slider.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/components/slider.reel/slider.js
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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,