Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

Conflicts:
	js/stage/binding-view.reel/binding-view.js

1 files changed, 2 insertions, 4 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 8e1a8d22..927c49d1 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
@@ -12,21 +12,19 @@
         <script type="text/montage-serialization">
 {
     "translateComposer1": {
-        "prototype": "montage/ui/composer/translate-composer",
+        "prototype": "ui/composer/translate-composer",
         "properties": {
             "component": {"@": "owner"},
             "axis": "horizontal",
-            "hasBouncing": false,
             "hasMomentum": false,
             "minTranslateX": 0
         },
         "bindings": {
             "maxTranslateX": {"<-": "@owner._sliderWidth"},
-            "translateX": {"<<->": "@owner._positionX"}
+            "translateX": {"<->": "@owner._positionX"}
         }
     },
     "owner": {
-        "prototype": "montage/ui/skeleton/range-input.reel",
         "properties": {
             "element": {"#": "slider"},
             "_handleEl": {"#": "slider-handle"},