From a3024011a91d3941f81481dd4d600e9684eb0fd4 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 2 Feb 2012 00:11:51 -0800 Subject: upgrading to Montage v0.6 Signed-off-by: Valerio Virgillito --- node_modules/montage/ui/progress.reel/progress.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'node_modules/montage/ui/progress.reel/progress.js') diff --git a/node_modules/montage/ui/progress.reel/progress.js b/node_modules/montage/ui/progress.reel/progress.js index 656e38ec..8bc68b05 100755 --- a/node_modules/montage/ui/progress.reel/progress.js +++ b/node_modules/montage/ui/progress.reel/progress.js @@ -4,7 +4,7 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ /** - @module "montage/ui/progress.reel" + @module "montage/ui/bluemoon/progress.reel" @requires montage/core/core @requires montage/ui/component */ @@ -14,12 +14,12 @@ var Montage = require("montage").Montage, @class module:montage/ui/progress.Progress @extends module:montage/ui/component.Component */ -exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/progress.reel".Progress# */ { +exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemoon/progress.reel".Progress# */ { /** Description TODO @private */ - _barEl: { + _barElement: { enumerable: false, value: null }, @@ -120,18 +120,17 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/progre draw: { enumerable: false, value: function() { - var percentage = (this._value / this._maximumValue) * 100; - if(percentage > 100) { - this._barEl.style.width = "100%"; - } else { - this._barEl.style.width = percentage + '%'; - } - + var ratio = this._value / this._maximumValue; + // constrain to interval [0, 1] + ratio = Math.min(Math.max(ratio, 0), 1); + // map into [0, 100] + var percentage = ratio * 100; + this._barElement.style.width = percentage + '%'; if(this._scrollingChanged) { if(this._scrolling) { - this._barEl.classList.add("scrolling"); + this._barElement.classList.add("scrolling"); } else { - this._barEl.classList.remove("scrolling"); + this._barElement.classList.remove("scrolling"); } this._scrollingChanged = false; } -- cgit v1.2.3