Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	css/ninja.css
	scss/imports/scss/_toolbar.scss

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 8 insertions, 10 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 4fa2d3db..8e1a8d22 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,27 +12,25 @@
         <script type="text/montage-serialization">
 {
     "translateComposer1": {
-        "module": "montage/ui/composer/translate-composer",
-        "name": "TranslateComposer",
+        "prototype": "montage/ui/composer/translate-composer",
         "properties": {
             "component": {"@": "owner"},
             "axis": "horizontal",
             "hasBouncing": false,
-            "hasMomentum": false
+            "hasMomentum": false,
+            "minTranslateX": 0
         },
         "bindings": {
-            "maxTranslateX": {"<-": "@owner.sliderWidth"},
-            "translateX": {"<<->": "@owner.positionX"}            
+            "maxTranslateX": {"<-": "@owner._sliderWidth"},
+            "translateX": {"<<->": "@owner._positionX"}
         }
     },
     "owner": {
-        "module": "montage/ui/skeleton/range-input.reel",
-        "name": "RangeInput",
+        "prototype": "montage/ui/skeleton/range-input.reel",
         "properties": {
             "element": {"#": "slider"},
-            "sliderEl": {"#": "slider"},
-            "handleEl": {"#": "slider-handle"},
-            "translateComposer": {"@": "translateComposer1"}
+            "_handleEl": {"#": "slider-handle"},
+            "_translateComposer": {"@": "translateComposer1"}
         }
 
     }