You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2013/07/19 22:28:06 UTC
git commit: [flex-asjs] [refs/heads/develop] - Changes recommended by
gjslint
Updated Branches:
refs/heads/develop 6ee7d4681 -> 8dc68bb44
Changes recommended by gjslint
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8dc68bb4
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8dc68bb4
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8dc68bb4
Branch: refs/heads/develop
Commit: 8dc68bb446f28973d6cf84c5996867eb665172fc
Parents: 6ee7d46
Author: Peter Ent <pe...@apache.org>
Authored: Fri Jul 19 16:27:56 2013 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Fri Jul 19 16:27:56 2013 -0400
----------------------------------------------------------------------
.../apache/flex/html/staticControls/Slider.js | 258 +++++++++++--------
1 file changed, 145 insertions(+), 113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8dc68bb4/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Slider.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Slider.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Slider.js
index c17eedf..53b3608 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Slider.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Slider.js
@@ -32,51 +32,52 @@ org.apache.flex.html.staticControls.Slider = function() {
};
goog.inherits(org.apache.flex.html.staticControls.Slider,
org.apache.flex.core.UIBase);
-
/**
* @override
* @this {org.apache.flex.html.staticControls.Slider}
* @param {Object} p The parent element.
*/
-org.apache.flex.html.staticControls.Slider.prototype.addToParent = function(p) {
+org.apache.flex.html.staticControls.Slider.prototype.addToParent =
+function(p) {
goog.base(this, 'addToParent', p);
this.element = document.createElement('div');
- this.element.className = "Slider";
- this.element.style.width = "200px";
- this.element.style.height = "30px";
+ this.element.className = 'Slider';
+ this.element.style.width = '200px';
+ this.element.style.height = '30px';
this.positioner = this.element;
-
+
this.track = document.createElement('div');
- this.track.className = "SliderTrack";
- this.track.id = "track";
- this.track.style.backgroundColor = "#E4E4E4";
- this.track.style.height = "10px";
- this.track.style.width = "200px";
- this.track.style.border = "thin solid #C4C4C4";
- this.track.style.position = "absolute";
- this.track.style.left = "0px";
- this.track.style.top = "10px";
- this.track.style.zIndex = "1";
+ this.track.className = 'SliderTrack';
+ this.track.id = 'track';
+ this.track.style.backgroundColor = '#E4E4E4';
+ this.track.style.height = '10px';
+ this.track.style.width = '200px';
+ this.track.style.border = 'thin solid #C4C4C4';
+ this.track.style.position = 'absolute';
+ this.track.style.left = '0px';
+ this.track.style.top = '10px';
+ this.track.style.zIndex = '1';
this.element.appendChild(this.track);
- //goog.events.listen(this.track, 'click', goog.bind(this.handleTrackClick, this));
- goog.events.listen(this.track, goog.events.EventType.CLICK, this.handleTrackClick, false, this);
-
+ goog.events.listen(this.track, goog.events.EventType.CLICK,
+ this.handleTrackClick, false, this);
+
this.thumb = document.createElement('div');
- this.thumb.className = "SliderThumb";
- this.thumb.id = "thumb";
- this.thumb.style.backgroundColor = "#949494";
- this.thumb.style.border = "thin solid #747474";
- this.thumb.style.position = "absolute";
- this.thumb.style.height = "30px";
- this.thumb.style.width = "10px";
- this.thumb.style.zIndex = "2";
- this.thumb.style.top = "0px";
- this.thumb.style.left = "20px";
+ this.thumb.className = 'SliderThumb';
+ this.thumb.id = 'thumb';
+ this.thumb.style.backgroundColor = '#949494';
+ this.thumb.style.border = 'thin solid #747474';
+ this.thumb.style.position = 'absolute';
+ this.thumb.style.height = '30px';
+ this.thumb.style.width = '10px';
+ this.thumb.style.zIndex = '2';
+ this.thumb.style.top = '0px';
+ this.thumb.style.left = '20px';
this.element.appendChild(this.thumb);
- goog.events.listen(this.thumb, goog.events.EventType.MOUSEDOWN, this.handleThumbDown, false, this);
-
+ goog.events.listen(this.thumb, goog.events.EventType.MOUSEDOWN,
+ this.handleThumbDown, false, this);
+
p.internalAddChild(this.element);
this.element.flexjs_wrapper = this;
@@ -90,88 +91,100 @@ org.apache.flex.html.staticControls.Slider.prototype.addToParent = function(p) {
* @this {org.apache.flex.html.staticControls.Slider}
* @return {Number} The value getter.
*/
-org.apache.flex.html.staticControls.Slider.prototype.get_value = function() {
- return this.value_;
-}
+org.apache.flex.html.staticControls.Slider.prototype.get_value =
+function() {
+ return this.value_;
+};
/**
* @expose
* @this {org.apache.flex.html.staticControls.Slider}
+ * @param {Object} newValue The new value.
* @return {void} The value setter.
*/
-org.apache.flex.html.staticControls.Slider.prototype.set_value = function(newValue) {
- if( newValue != this.value_ ) {
- this.value_ = newValue;
- this.dispatchEvent('valueChanged');
- }
-}
+org.apache.flex.html.staticControls.Slider.prototype.set_value =
+function(newValue) {
+ if (newValue != this.value_) {
+ this.value_ = newValue;
+ this.dispatchEvent('valueChanged');
+ }
+};
/**
* @expose
* @this {org.apache.flex.html.staticControls.Slider}
* @return {Number} The minimum getter.
*/
-org.apache.flex.html.staticControls.Slider.prototype.get_minimum = function() {
- return this.minimum_;
-}
+org.apache.flex.html.staticControls.Slider.prototype.get_minimum =
+function() {
+ return this.minimum_;
+};
/**
* @expose
* @this {org.apache.flex.html.staticControls.Slider}
+ * @param {Object} value The new minimum value.
* @return {void} The minimum setter.
*/
-org.apache.flex.html.staticControls.Slider.prototype.set_minimum = function(value) {
- if( value != this.minimum_ ) {
- this.minimum_ = value;
- this.dispatchEvent('minimumChanged');
- }
-}
+org.apache.flex.html.staticControls.Slider.prototype.set_minimum =
+function(value) {
+ if (value != this.minimum_) {
+ this.minimum_ = value;
+ this.dispatchEvent('minimumChanged');
+ }
+};
/**
* @expose
* @this {org.apache.flex.html.staticControls.Slider}
* @return {Number} The maximum getter.
*/
-org.apache.flex.html.staticControls.Slider.prototype.get_maximum = function() {
- return this.maximum_;
-}
+org.apache.flex.html.staticControls.Slider.prototype.get_maximum =
+function() {
+ return this.maximum_;
+};
/**
* @expose
* @this {org.apache.flex.html.staticControls.Slider}
+ * @param {Object} value The new maximum value.
* @return {void} The maximum setter.
*/
-org.apache.flex.html.staticControls.Slider.prototype.set_maximum = function(value) {
- if( value != this.maximum_ ) {
- this.maximum_ = value;
- this.dispatchEvent('maximumChanged');
- }
-}
+org.apache.flex.html.staticControls.Slider.prototype.set_maximum =
+function(value) {
+ if (value != this.maximum_) {
+ this.maximum_ = value;
+ this.dispatchEvent('maximumChanged');
+ }
+};
/**
* @expose
* @this {org.apache.flex.html.staticControls.Slider}
* @return {Number} The snapInterval getter.
*/
-org.apache.flex.html.staticControls.Slider.prototype.get_snapInterval = function() {
- return this.snapInterval_;
-}
+org.apache.flex.html.staticControls.Slider.prototype.get_snapInterval =
+function() {
+ return this.snapInterval_;
+};
/**
* @expose
* @this {org.apache.flex.html.staticControls.Slider}
+ * @param {Object} value The new snapInterval value.
* @return {void} The snapInterval setter.
*/
-org.apache.flex.html.staticControls.Slider.prototype.set_snapInterval = function(value) {
- if( value != this.snapInterval_ ) {
- this.snapInterval_ = value;
- this.dispatchEvent('snapIntervalChanged');
- }
-}
-
+org.apache.flex.html.staticControls.Slider.prototype.set_snapInterval =
+function(value) {
+ if (value != this.snapInterval_) {
+ this.snapInterval_ = value;
+ this.dispatchEvent('snapIntervalChanged');
+ }
+};
/**
* @this {org.apache.flex.html.staticControls.Slider}
+ * @param {Object} value The current value.
* @return {Number} Calculates the new value based snapInterval and stepSize.
*/
org.apache.flex.html.staticControls.Slider.prototype.snap = function(value)
@@ -180,84 +193,103 @@ org.apache.flex.html.staticControls.Slider.prototype.snap = function(value)
var n = Math.round((value - this.minimum_) / si) * si + this.minimum_;
if (value > 0)
{
- if (value - n < n + si - value)
- return n;
- return n + si;
+ if (value - n < n + si - value)
+ return n;
+ return n + si;
}
if (value - n > n + si - value)
- return n + si;
+ return n + si;
return n;
-}
+};
/**
* @this {org.apache.flex.html.staticControls.Slider}
+ * @param {Event} event The event triggering the function.
* @return {void} Handles click on track.
*/
-org.apache.flex.html.staticControls.Slider.prototype.handleTrackClick = function(event)
+org.apache.flex.html.staticControls.Slider.prototype.handleTrackClick =
+function(event)
{
- this.value_ = this.snap(Math.min(this.maximum_, this.value_ + this.stepSize_));
- this.dispatchEvent(new org.apache.flex.events.Event("valueChanged"));
-
- this.origin = parseInt(this.thumb.style.left,10);
- this.position = parseInt(this.thumb.style.left,10);
-
- this.calculateValueFromMousePosition(event,true);
+ this.value_ = this.snap(Math.min(this.maximum_, this.value_ +
+ this.stepSize_));
+ this.dispatchEvent(new org.apache.flex.events.Event('valueChanged'));
+
+ this.origin = parseInt(this.thumb.style.left, 10);
+ this.position = parseInt(this.thumb.style.left, 10);
+
+ this.calcValFromMousePosition(event, true);
};
/**
* @this {org.apache.flex.html.staticControls.Slider}
- * @return {void} Handles mouse-down on the thumb
+ * @param {Event} event The event triggering the function.
+ * @return {void} Handles mouse-down on the thumb.
*/
-org.apache.flex.html.staticControls.Slider.prototype.handleThumbDown = function(event)
+org.apache.flex.html.staticControls.Slider.prototype.handleThumbDown =
+function(event)
{
- goog.events.listen(this.element, goog.events.EventType.MOUSEUP, this.handleThumbUp, false, this);
- goog.events.listen(this.element, goog.events.EventType.MOUSEMOVE, this.handleThumbMove, false, this);
-
+ goog.events.listen(this.element, goog.events.EventType.MOUSEUP,
+ this.handleThumbUp, false, this);
+ goog.events.listen(this.element, goog.events.EventType.MOUSEMOVE,
+ this.handleThumbMove, false, this);
+
this.origin = event.clientX;
- this.position = parseInt(this.thumb.style.left,10);
+ this.position = parseInt(this.thumb.style.left, 10);
};
/**
* @this {org.apache.flex.html.staticControls.Slider}
- * @return {void} Handles mouse-up on the thumb
+ * @param {Event} event The event triggering the function.
+ * @return {void} Handles mouse-up on the thumb.
*/
-org.apache.flex.html.staticControls.Slider.prototype.handleThumbUp = function(event)
+org.apache.flex.html.staticControls.Slider.prototype.handleThumbUp =
+function(event)
{
- goog.events.unlisten(this.element, goog.events.EventType.MOUSEUP, this.handleThumbUp, false, this);
- goog.events.unlisten(this.element, goog.events.EventType.MOUSEMOVE, this.handleThumbMove, false, this);
-
- this.calculateValueFromMousePosition(event,false);
+ goog.events.unlisten(this.element, goog.events.EventType.MOUSEUP,
+ this.handleThumbUp, false, this);
+ goog.events.unlisten(this.element, goog.events.EventType.MOUSEMOVE,
+ this.handleThumbMove, false, this);
+
+ this.calcValFromMousePosition(event, false);
};
/**
* @this {org.apache.flex.html.staticControls.Slider}
- * @return {void} Handles mouse-move on the thumb
+ * @param {Event} event The event triggering the function.
+ * @return {void} Handles mouse-move on the thumb.
*/
-org.apache.flex.html.staticControls.Slider.prototype.handleThumbMove = function(event)
+org.apache.flex.html.staticControls.Slider.prototype.handleThumbMove =
+function(event)
{
- this.calculateValueFromMousePosition(event,false);
-}
+ this.calcValFromMousePosition(event, false);
+};
/**
* @this {org.apache.flex.html.staticControls.Slider}
- * @return {void} Determines the new value based on the movement of the mouse along the slider
+ * @param {Event} event The event triggering the function.
+ * @param {Boolean} useOffset If true, event.offsetX is used in the calculation.
+ * @return {void} Determines the new value based on the movement of the mouse
+ * along the slider.
*/
-org.apache.flex.html.staticControls.Slider.prototype.calculateValueFromMousePosition = function(event,useOffset)
+org.apache.flex.html.staticControls.Slider.prototype.calcValFromMousePosition =
+function(event, useOffset)
{
- var deltaX = (useOffset?event.offsetX:event.clientX) - this.origin;
- var thumbW = parseInt(this.thumb.style.width,10) / 2;
+ var deltaX = (useOffset ? event.offsetX : event.clientX) - this.origin;
+ var thumbW = parseInt(this.thumb.style.width, 10) / 2;
var newX = this.position + deltaX;
-
- var p = newX/parseInt(this.track.style.width,10);
- var n = p*(this.maximum_ - this.minimum_) + this.minimum_;
+
+ var p = newX / parseInt(this.track.style.width, 10);
+ var n = p * (this.maximum_ - this.minimum_) + this.minimum_;
n = this.snap(n);
- if( n < this.minimum_ ) n = this.minimum_;
- else if( n > this.maximum_ ) n = this.maximum_;
-
- p = (n-this.minimum_)/(this.maximum_ - this.minimum_);
- newX = p*parseInt(this.track.style.width,10);
-
- this.thumb.style.left = String(newX - parseInt(this.thumb.style.width,10)/2) + "px";
-
+ if (n < this.minimum_) n = this.minimum_;
+ else if (n > this.maximum_) n = this.maximum_;
+
+ p = (n - this.minimum_) / (this.maximum_ - this.minimum_);
+ newX = p * parseInt(this.track.style.width, 10);
+
+ this.thumb.style.left = String(newX -
+ parseInt(this.thumb.style.width, 10) / 2) +
+ 'px';
+
this.value_ = n;
-};
\ No newline at end of file
+};