Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/3D/view-utils.js

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 @@
             "component": {"@": "owner"},
             "axis": "horizontal",
             "hasBouncing": false,
-            "hasMomentum": false,
-            "invertAxis": true
+            "hasMomentum": false
         },
         "bindings": {
-            "maxTranslateX": {
-                "boundObject": {"@": "owner"},
-                "boundObjectPropertyPath": "sliderWidth",
-                "oneway": true
-            },
-            "translateX": {
-                "boundObject": {"@": "owner"},
-                "boundObjectPropertyPath": "sliderLeft",
-                "oneway": true
-            },
-            "translateX": {
-                "boundObject": {"@": "owner"},
-                "boundObjectPropertyPath": "positionX"
-            }
+            "maxTranslateX": {"<-": "@owner.sliderWidth"},
+            "translateX": {"<<->": "@owner.positionX"}            
         }
     },
     "owner": {