aboutsummaryrefslogtreecommitdiff
path: root/js/components/slider.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 01:03:59 -0700
committerArmen Kesablyan2012-06-19 01:03:59 -0700
commit2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch)
treed352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/slider.reel
parent244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff)
parentc59eb371559a3061ce53223e249ca97daace5968 (diff)
downloadninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
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,