diff options
author | Eric Guzman | 2012-05-17 17:43:05 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-17 17:43:05 -0700 |
commit | 458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch) | |
tree | ee329e409fe28ae54c894b9e27e82e1f85aefc85 /node_modules/montage/ui/skeleton/range-input.reel/range-input.html | |
parent | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff) | |
parent | 52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff) | |
download | ninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/document/templates/montage-html/default_html.css
js/lib/NJUtils.js
Diffstat (limited to 'node_modules/montage/ui/skeleton/range-input.reel/range-input.html')
-rw-r--r-- | node_modules/montage/ui/skeleton/range-input.reel/range-input.html | 18 |
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 @@ | |||
12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
13 | { | 13 | { |
14 | "translateComposer1": { | 14 | "translateComposer1": { |
15 | "module": "montage/ui/composer/translate-composer", | 15 | "prototype": "montage/ui/composer/translate-composer", |
16 | "name": "TranslateComposer", | ||
17 | "properties": { | 16 | "properties": { |
18 | "component": {"@": "owner"}, | 17 | "component": {"@": "owner"}, |
19 | "axis": "horizontal", | 18 | "axis": "horizontal", |
20 | "hasBouncing": false, | 19 | "hasBouncing": false, |
21 | "hasMomentum": false | 20 | "hasMomentum": false, |
21 | "minTranslateX": 0 | ||
22 | }, | 22 | }, |
23 | "bindings": { | 23 | "bindings": { |
24 | "maxTranslateX": {"<-": "@owner.sliderWidth"}, | 24 | "maxTranslateX": {"<-": "@owner._sliderWidth"}, |
25 | "translateX": {"<<->": "@owner.positionX"} | 25 | "translateX": {"<<->": "@owner._positionX"} |
26 | } | 26 | } |
27 | }, | 27 | }, |
28 | "owner": { | 28 | "owner": { |
29 | "module": "montage/ui/skeleton/range-input.reel", | 29 | "prototype": "montage/ui/skeleton/range-input.reel", |
30 | "name": "RangeInput", | ||
31 | "properties": { | 30 | "properties": { |
32 | "element": {"#": "slider"}, | 31 | "element": {"#": "slider"}, |
33 | "sliderEl": {"#": "slider"}, | 32 | "_handleEl": {"#": "slider-handle"}, |
34 | "handleEl": {"#": "slider-handle"}, | 33 | "_translateComposer": {"@": "translateComposer1"} |
35 | "translateComposer": {"@": "translateComposer1"} | ||
36 | } | 34 | } |
37 | 35 | ||
38 | } | 36 | } |