diff options
author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/skeleton | |
parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/ui/skeleton')
-rw-r--r-- | node_modules/montage/ui/skeleton/range-input.reel/range-input.html | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/node_modules/montage/ui/skeleton/range-input.reel/range-input.html b/node_modules/montage/ui/skeleton/range-input.reel/range-input.html index 8fc12900..4fa2d3db 100644 --- a/node_modules/montage/ui/skeleton/range-input.reel/range-input.html +++ b/node_modules/montage/ui/skeleton/range-input.reel/range-input.html | |||
@@ -18,24 +18,11 @@ | |||
18 | "component": {"@": "owner"}, | 18 | "component": {"@": "owner"}, |
19 | "axis": "horizontal", | 19 | "axis": "horizontal", |
20 | "hasBouncing": false, | 20 | "hasBouncing": false, |
21 | "hasMomentum": false, | 21 | "hasMomentum": false |
22 | "invertAxis": true | ||
23 | }, | 22 | }, |
24 | "bindings": { | 23 | "bindings": { |
25 | "maxTranslateX": { | 24 | "maxTranslateX": {"<-": "@owner.sliderWidth"}, |
26 | "boundObject": {"@": "owner"}, | 25 | "translateX": {"<<->": "@owner.positionX"} |
27 | "boundObjectPropertyPath": "sliderWidth", | ||
28 | "oneway": true | ||
29 | }, | ||
30 | "translateX": { | ||
31 | "boundObject": {"@": "owner"}, | ||
32 | "boundObjectPropertyPath": "sliderLeft", | ||
33 | "oneway": true | ||
34 | }, | ||
35 | "translateX": { | ||
36 | "boundObject": {"@": "owner"}, | ||
37 | "boundObjectPropertyPath": "positionX" | ||
38 | } | ||
39 | } | 26 | } |
40 | }, | 27 | }, |
41 | "owner": { | 28 | "owner": { |