aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/bluemoon
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-18 13:48:51 -0700
committerValerio Virgillito2012-04-18 13:48:51 -0700
commit2e04af953463643791f6362bd8ef4c6ba190abfa (patch)
treed07aaf646091ddf9dad5b030a7905055fd323490 /node_modules/montage/ui/bluemoon
parent616a8532099fec2a15855eac97cd85cb60c4451c (diff)
downloadninja-2e04af953463643791f6362bd8ef4c6ba190abfa.tar.gz
Squashed commit of the following:
commit 2054551bfb01a0f4ca2e138b9d724835462d45cd Merge: 765c2da 616a853 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 18 13:48:21 2012 -0700 Merge branch 'refs/heads/master' into integration commit 765c2da8e1aa03550caf42b2bd5f367555ad2843 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:29:41 2012 -0700 updating the picasa carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406 Merge: d27f2df cacb4a2 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:03:50 2012 -0700 Merge branch 'refs/heads/master' into integration commit d27f2df4d846064444263d7832d213535962abe7 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 11 10:39:36 2012 -0700 integrating new picasa carousel component Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 10 14:33:00 2012 -0700 fixed the text area case issue Text area was renamed from TextArea to Textarea Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 1e83e26652266136802bc7af930379c1ecd631a6 Author: Valerio Virgillito <valerio@motorola.com> Date: Mon Apr 9 22:10:45 2012 -0700 integrating montage v0.8 into ninja. Signed-off-by: Valerio Virgillito <valerio@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/bluemoon')
-rw-r--r--node_modules/montage/ui/bluemoon/slider.reel/slider.js14
1 files changed, 12 insertions, 2 deletions
diff --git a/node_modules/montage/ui/bluemoon/slider.reel/slider.js b/node_modules/montage/ui/bluemoon/slider.reel/slider.js
index 56c4faa8..1a0e3d6e 100644
--- a/node_modules/montage/ui/bluemoon/slider.reel/slider.js
+++ b/node_modules/montage/ui/bluemoon/slider.reel/slider.js
@@ -4,7 +4,7 @@
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ 5 </copyright> */
6/** 6/**
7 @module "montage/ui/bluemoon/slider.reel" 7 @module "montage/ui/bluemoon/slider.reel"
8 @requires montage/core/core 8 @requires montage/core/core
9 @requires montage/ui/component 9 @requires montage/ui/component
10*/ 10*/
@@ -199,6 +199,9 @@ exports.Slider = Montage.create(Component,/** @lends module:"montage/ui/bluemoon
199 }, 199 },
200 set: function (value) { 200 set: function (value) {
201 if (value !== this._minValue) { 201 if (value !== this._minValue) {
202 if(String.isString(value)) {
203 value = parseFloat(value);
204 }
202 this._minValue = value; 205 this._minValue = value;
203 this._valueRange = null; 206 this._valueRange = null;
204 this.needsDraw = true; 207 this.needsDraw = true;
@@ -226,6 +229,9 @@ exports.Slider = Montage.create(Component,/** @lends module:"montage/ui/bluemoon
226 }, 229 },
227 set: function (value) { 230 set: function (value) {
228 if (value !== this._maxValue) { 231 if (value !== this._maxValue) {
232 if(String.isString(value)) {
233 value = parseFloat(value);
234 }
229 this._maxValue = value; 235 this._maxValue = value;
230 this._valueRange = null; 236 this._valueRange = null;
231 this.needsDraw = true; 237 this.needsDraw = true;
@@ -288,6 +294,9 @@ exports.Slider = Montage.create(Component,/** @lends module:"montage/ui/bluemoon
288 }, 294 },
289 set: function (value) { 295 set: function (value) {
290 if (!isNaN(value)) { 296 if (!isNaN(value)) {
297 if(String.isString(value)) {
298 value = parseFloat(value);
299 }
291 if (value !== this._value) { 300 if (value !== this._value) {
292 this._value = parseFloat(value); 301 this._value = parseFloat(value);
293 this.needsDraw = true; 302 this.needsDraw = true;
@@ -450,7 +459,8 @@ exports.Slider = Montage.create(Component,/** @lends module:"montage/ui/bluemoon
450 */ 459 */
451 handleMousemove: { 460 handleMousemove: {
452 value: function (event) { 461 value: function (event) {
453 this.value = this._value + ((event.clientX - this._cursorPosition) * (this.valueRange)) / this._width; 462 this.value = this.value + ((event.clientX - this._cursorPosition) * (this.valueRange)) / this._width;
463
454 this._cursorPosition = event.clientX; 464 this._cursorPosition = event.clientX;
455 event.preventDefault(); 465 event.preventDefault();
456 event.stopPropagation(); 466 event.stopPropagation();