aboutsummaryrefslogtreecommitdiff
path: root/js/components/slider.reel
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/slider.reel
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/slider.reel')
-rwxr-xr-xjs/components/slider.reel/slider.html4
-rwxr-xr-xjs/components/slider.reel/slider.js10
2 files changed, 7 insertions, 7 deletions
diff --git a/js/components/slider.reel/slider.html b/js/components/slider.reel/slider.html
index b0f4c5d7..7df50bd8 100755
--- a/js/components/slider.reel/slider.html
+++ b/js/components/slider.reel/slider.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -47,7 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
47 } 47 }
48 } 48 }
49 </script> 49 </script>
50 50
51 51
52</head> 52</head>
53<body> 53<body>
diff --git a/js/components/slider.reel/slider.js b/js/components/slider.reel/slider.js
index 57514edb..2b3ebb1a 100755
--- a/js/components/slider.reel/slider.js
+++ b/js/components/slider.reel/slider.js
@@ -150,7 +150,7 @@ var Slider = exports.Slider = Montage.create(SliderBase, {
150 clickPoint = webkitConvertPointFromPageToNode(this.element, new WebKitPoint(offset,pageY)).y; 150 clickPoint = webkitConvertPointFromPageToNode(this.element, new WebKitPoint(offset,pageY)).y;
151 } 151 }
152 this.value = (clickPoint*this._valueCoef)+this._minValue; 152 this.value = (clickPoint*this._valueCoef)+this._minValue;
153 153
154 if(!this._isMouseDown && (this._previousValue !== this._value)) 154 if(!this._isMouseDown && (this._previousValue !== this._value))
155 { 155 {
156 this._dispatchActionEvent(); 156 this._dispatchActionEvent();
@@ -197,7 +197,7 @@ var Slider = exports.Slider = Montage.create(SliderBase, {
197 draw: { 197 draw: {
198 value: function() { 198 value: function() {
199 this.setPercentValueFromValue(); 199 this.setPercentValueFromValue();
200 200
201 if(this._direction === "horizontal") 201 if(this._direction === "horizontal")
202 { 202 {
203 this.knob.style.left = this._percentValue +"%"; 203 this.knob.style.left = this._percentValue +"%";
@@ -265,7 +265,7 @@ var Slider = exports.Slider = Montage.create(SliderBase, {
265 } 265 }
266 266
267 267
268 268
269 269
270 if(this._enabled) 270 if(this._enabled)
271 { 271 {
@@ -282,8 +282,8 @@ var Slider = exports.Slider = Montage.create(SliderBase, {
282 this.value = this._minValue; 282 this.value = this._minValue;
283 } 283 }
284 } 284 }
285 285
286 } 286 }
287 } 287 }
288 288
289}); 289});