r1154 - in branches/dev/slider: tests/visual ui
Author: rdworth
Date: Sat Dec 13 21:42:20 2008
New Revision: 1154
Modified:
branches/dev/slider/tests/visual/slider.html
branches/dev/slider/ui/ui.slider.js
Log:
Started slider markup refactor (#3650) in branches/dev/slider
Modified: branches/dev/slider/tests/visual/slider.html
==============================================================================
--- branches/dev/slider/tests/visual/slider.html (original)
+++ branches/dev/slider/tests/visual/slider.html Sat Dec 13 21:42:20 2008
@@ -9,7 +9,8 @@
<script type="text/javascript" src="../../ui/ui.slider.js"></script>
<script type="text/javascript">
$(function() {
- $("#slider").slider();
+ $("#slider1").slider();
+ $("#slider2").slider({ max: 10, step: 2, value: 3, axis: 'vertical'
}).slider('disable');
});
</script>
</head>
@@ -17,9 +18,13 @@
<body>
<ul class="plugins">
-<li class="plugin">
+<li class="plugin" style="width:400px;padding:1em;">
Slider
- <div id="slider"></div>
+ <div id="slider1"></div>
+</li>
+<li class="plugin" style="height:auto;padding:1em;">
+ Slider
+ <div id="slider2" style="height:300px;"></div>
</li>
</ul>
Modified: branches/dev/slider/ui/ui.slider.js
==============================================================================
--- branches/dev/slider/ui/ui.slider.js (original)
+++ branches/dev/slider/ui/ui.slider.js Sat Dec 13 21:42:20 2008
@@ -12,528 +12,123 @@
*/
(function($) {
-$.fn.unwrap = $.fn.unwrap || function(expr) {
- return this.each(function(){
- $(this).parents(expr).eq(0).after(this).remove();
- });
-};
-
$.widget("ui.slider", {
_init: function() {
var self = this;
- this.element.addClass("ui-slider ui-widget ui-widget-content
ui-corner-all");
- this._initBoundaries();
-
- // Initialize mouse and key events for interaction
- this.handle = $(this.options.handle, this.element);
- if (!this.handle.length) {
- self.handle = self.generated = $(self.options.handles ||
[0]).map(function() {
- var handle = $('<a href="#"></a>').addClass("ui-slider-handle
ui-state-default ui-corner-all").appendTo(self.element);
- if (this.id)
- handle.attr("id", this.id);
- return handle[0];
- });
- }
-
- var handleclass = function(el) {
- this.element = $(el);
- this.element.data("mouse", this);
- this.options = self.options;
-
- this.element.bind("mousedown", function() {
- if(self.currentHandle) this.blur(self.currentHandle);
- self._focus(this, true);
- });
-
- this._mouseInit();
- };
-
- $.extend(handleclass.prototype, $.ui.mouse, {
- _mouseCapture: function() { return true; },
- _mouseStart: function(event) { return self._start.call(self, event,
this.element[0]); },
- _mouseDrag: function(event) { return self._drag.call(self, event,
this.element[0]); },
- _mouseStop: function(event) { return self._stop.call(self, event,
this.element[0]); },
- trigger: function(event) { this._mouseDown(event); }
- });
-
- $(this.handle)
- .each(function() {
- new handleclass(this);
- })
- .parent()
- .bind('click', function() { return false; })
- .bind('focus', function(event) { self._focus(this.firstChild); })
- .bind('blur', function(event) { self._blur(this.firstChild); })
- .bind('keydown', function(event) { if(!self.options.noKeyboard) return
self._keydown(event.keyCode, this.firstChild); })
- ;
-
- // Bind the click to the slider itself
- this.element.bind('mousedown.slider', function(event) {
-
- if($(event.target).is('.ui-slider-handle')) return;
-
- //Go to the actual clicked posiion, apply a click
- self._click.apply(self, [event]);
-
- //initiate a handle drag, so we can click+drag somewhere
- self.currentHandle.data("mouse").trigger(event);
-
- //This is for always triggering the change event
- self.firstValue = self.firstValue + 1;
-
- });
- // Move the first handle to the startValue
- $.each(this.options.handles || [], function(index, handle) {
- self.moveTo(handle.start, index, true);
+ this.element
+ .addClass("ui-slider"
+ + " ui-slider-" + this._axis()
+ + " ui-widget"
+ + " ui-widget-content"
+ + " ui-corner-all");
+
+ this.handle = $('<a href="#"></a>')
+ .appendTo(this.element)
+ .addClass("ui-slider-handle"
+ + " ui-state-default"
+ + " ui-corner-all");
+
+ this.handle.keydown(function(event) {
+ if (self.options.disabled) return;
+ switch (event.keyCode) {
+ case $.keyCode.HOME:
+ self._setData('value', self._valueMin());
+ break;
+ case $.keyCode.LEFT:
+ (self.options.axis == 'horizontal') && self._setData('value',
self.value() - self._step());
+ break;
+ case $.keyCode.UP:
+ (self.options.axis == 'vertical') && self._setData('value',
self.value() - self._step());
+ break;
+ case $.keyCode.RIGHT:
+ (self.options.axis == 'horizontal') && self._setData('value',
self.value() + self._step());
+ break;
+ case $.keyCode.DOWN:
+ (self.options.axis == 'vertical') && self._setData('value',
self.value() + self._step());
+ break;
+ case $.keyCode.END:
+ self._setData('value', self._valueMax());
+ break;
+ }
});
- if (!isNaN(this.options.startValue))
- this.moveTo(this.options.startValue, 0, true);
- this.previousHandle = $(this.handle[0]); //set the previous handle to
the first to allow clicking before selecting the handle
- if(this.handle.length == 2 && this.options.range) this._createRange();
+ this._refreshValue();
},
destroy: function() {
+ this.handle.remove();
+
this.element
- .removeClass("ui-slider ui-slider-disabled ui-widget ui-widget-content
ui-corner-all")
+ .removeClass("ui-slider"
+ + " ui-slider-horizontal"
+ + " ui-slider-vertical"
+ + " ui-slider-disabled"
+ + " ui-widget"
+ + " ui-widget-content"
+ + " ui-corner-all")
.removeData("slider")
.unbind(".slider");
- if(this.handle && this.handle.length) {
- this.handle
- .unwrap("a");
- this.handle.each(function() {
- var mouse = $(this).data("mouse");
- mouse && mouse._mouseDestroy();
- });
- }
-
- this.generated && this.generated.remove();
-
- },
-
- _start: function(event, handle) {
-
- var o = this.options;
- if(o.disabled) return false;
-
- // Prepare the outer size
- this.actualSize = { width: this.element.outerWidth() , height:
this.element.outerHeight() };
-
- // This is a especially ugly fix for strange blur events happening on
mousemove events
- if (!this.currentHandle)
- this._focus(this.previousHandle, true);
-
- this.offset = this.element.offset();
-
- this.handleOffset = this.currentHandle.offset();
- this.clickOffset = { top: event.pageY - this.handleOffset.top, left:
event.pageX - this.handleOffset.left };
-
- this.firstValue = this.value();
-
- this._propagate('start', event);
- this._drag(event, handle);
- return true;
-
},
- _drag: function(event, handle) {
-
- var o = this.options;
-
- var position = { top: event.pageY - this.offset.top -
this.clickOffset.top, left: event.pageX - this.offset.left -
this.clickOffset.left};
- if(!this.currentHandle) this._focus(this.previousHandle, true); //This
is a especially ugly fix for strange blur events happening on mousemove
events
-
- position.left = this._translateLimits(position.left, "x");
- position.top = this._translateLimits(position.top, "y");
-
- if (o.stepping.x) {
- var value = this._convertValue(position.left, "x");
- value = this._round(value / o.stepping.x) * o.stepping.x;
- position.left = this._translateValue(value, "x");
- }
- if (o.stepping.y) {
- var value = this._convertValue(position.top, "y");
- value = this._round(value / o.stepping.y) * o.stepping.y;
- position.top = this._translateValue(value, "y");
- }
-
- position.left = this._translateRange(position.left, "x");
- position.top = this._translateRange(position.top, "y");
-
- if(o.axis != "vertical") this.currentHandle.css({ left: position.left });
- if(o.axis != "horizontal") this.currentHandle.css({ top: position.top });
-
- //Store the slider's value
- this.currentHandle.data("mouse").sliderValue = {
- x: this._round(this._convertValue(position.left, "x")) || 0,
- y: this._round(this._convertValue(position.top, "y")) || 0
- };
-
- if (this.rangeElement)
- this._updateRange();
- this._propagate('slide', event);
- return false;
+ value: function(newValue) {
+ arguments.length && this._setData("value", newValue);
+ return this._value();
},
- _stop: function(event) {
-
- this._propagate('stop', event);
-
- if (this.firstValue != this.value())
- this._propagate('change', event);
-
- // This is a especially ugly fix for strange blur events happening on
mousemove events
- this._focus(this.currentHandle, true);
-
- return false;
-
- },
-
- _round: function(value) {
-
- return this.options.round ? parseInt(value,10) : parseFloat(value);
-
- },
-
- _setData: function(key, value) {
-
+ _setData: function(key, value){
$.widget.prototype._setData.apply(this, arguments);
- if (/min|max|steps/.test(key)) {
- this._initBoundaries();
- }
-
- if(key == "range") {
- value ? this.handle.length == 2 && this._createRange() :
this._removeRange();
- }
-
- },
-
- _initBoundaries: function() {
-
- var element = this.element[0], o = this.options;
- this.actualSize = { width: this.element.outerWidth() , height:
this.element.outerHeight() };
-
- $.extend(o, {
- axis: o.axis || (element.offsetWidth <
element.offsetHeight ? 'vertical' : 'horizontal'),
- max: !isNaN(parseInt(o.max,10)) ? { x: parseInt(o.max, 10), y:
parseInt(o.max, 10) } : ({ x: o.max && o.max.x || 100, y: o.max && o.max.y |
| 100 }),
- min: !isNaN(parseInt(o.min,10)) ? { x: parseInt(o.min, 10), y:
parseInt(o.min, 10) } : ({ x: o.min && o.min.x || 0, y: o.min && o.min.y ||
0 })
- });
- //Prepare the real maxValue
- o.realMax = {
- x: o.max.x - o.min.x,
- y: o.max.y - o.min.y
- };
- //Calculate stepping based on steps
- o.stepping = {
- x: o.stepping && o.stepping.x || parseInt(o.stepping, 10) || (o.steps ?
o.realMax.x/(o.steps.x || parseInt(o.steps, 10) || o.realMax.x) : 0),
- y: o.stepping && o.stepping.y || parseInt(o.stepping, 10) || (o.steps ?
o.realMax.y/(o.steps.y || parseInt(o.steps, 10) || o.realMax.y) : 0)
- };
-
- },
-
- _keydown: function(keyCode, handle) {
-
- if (this.options.disabled)
- return;
-
- var k = keyCode;
- if(/(33|34|35|36|37|38|39|40)/.test(k)) {
- var o = this.options, xpos, ypos;
- if (/(35|36)/.test(k)) {
- xpos = (k == 35) ? o.max.x : o.min.x;
- ypos = (k == 35) ? o.max.y : o.min.y;
- } else {
- var oper = /(34|37|40)/.test(k) ? "-=" : "+=";
- var step = /(37|38|39|40)/.test(k) ? "_oneStep" : "_pageStep";
- xpos = oper + this[step]("x");
- ypos = oper + this[step]("y");
- }
- this.moveTo({
- x: xpos,
- y: ypos
- }, handle);
- return false;
- }
- return true;
-
- },
-
- _focus: function(handle,hard) {
-
- this.currentHandle = $(handle).addClass('ui-slider-handle-active');
-
- if (hard)
- this.currentHandle.parent()[0].focus();
-
- },
-
- _blur: function(handle) {
-
- $(handle).removeClass('ui-slider-handle-active');
-
- if(this.currentHandle && this.currentHandle[0] == handle) {
- this.previousHandle = this.currentHandle;
- this.currentHandle = null;
- };
-
- },
-
- _click: function(event) {
-
- // This method is only used if:
- // - The user didn't click a handle
- // - The Slider is not disabled
- // - There is a current, or previous selected handle (otherwise we
wouldn't know which one to move)
-
- var pointer = [event.pageX, event.pageY];
-
- var clickedHandle = false;
- this.handle.each(function() {
- if(this == event.target)
- clickedHandle = true;
- });
- if (clickedHandle || this.options.disabled || !(this.currentHandle ||
this.previousHandle))
- return;
-
- // If a previous handle was focussed, focus it again
- if (!this.currentHandle && this.previousHandle)
- this._focus(this.previousHandle, true);
-
- // propagate only for distance > 0, otherwise propagation is done my drag
- this.offset = this.element.offset();
-
- this.moveTo({
- y: this._convertValue(event.pageY - this.offset.top -
this.currentHandle[0].offsetHeight/2, "y"),
- x: this._convertValue(event.pageX - this.offset.left -
this.currentHandle[0].offsetWidth/2, "x")
- }, null, !this.options.distance);
-
- },
-
- _createRange: function() {
-
- if(this.rangeElement) return;
- this.rangeElement = $('<div></div>')
- .addClass('ui-slider-range')
- .css({ position: 'absolute' })
- .appendTo(this.element);
- this._updateRange();
-
- },
-
- _removeRange: function() {
-
- this.rangeElement.remove();
- this.rangeElement = null;
-
- },
-
- _updateRange: function() {
-
- var prop = this.options.axis == "vertical" ? "top" : "left";
- var size = this.options.axis == "vertical" ? "height" : "width";
-
- this.rangeElement.css(prop, (this._round($(this.handle[0]).css(prop)) ||
0) + this._handleSize(0, this.options.axis == "vertical" ? "y" : "x")/2);
- this.rangeElement.css(size, (this._round($(this.handle[1]).css(prop)) ||
0) - (this._round($(this.handle[0]).css(prop)) || 0));
-
- },
-
- _getRange: function() {
-
- return this.rangeElement ?
this._convertValue(this._round(this.rangeElement.css(this.options.axis
== "vertical" ? "height" : "width")), this.options.axis
== "vertical" ? "y" : "x") : null;
-
- },
-
- _handleIndex: function() {
-
- return this.handle.index(this.currentHandle[0]);
-
- },
-
- value: function(handle, axis) {
-
- if(this.handle.length == 1) this.currentHandle = this.handle;
- if(!axis) axis = this.options.axis == "vertical" ? "y" : "x";
-
- var curHandle = $(handle != undefined && handle !== null ?
this.handle[handle] || handle : this.currentHandle);
-
- if(curHandle.data("mouse").sliderValue) {
- return this._round(curHandle.data("mouse").sliderValue[axis]);
- } else {
- return this._round(((this._round(curHandle.css(axis
== "x" ? "left" : "top")) / (this.actualSize[axis
== "x" ? "width" : "height"] - this._handleSize(handle,axis))) *
this.options.realMax[axis]) + this.options.min[axis]);
+ switch (key) {
+ case 'value':
+ this._refreshValue();
+ break;
}
-
},
- _convertValue: function(value,axis) {
-
- return this.options.min[axis] + (value / (this.actualSize[axis
== "x" ? "width" : "height"] - this._handleSize(null,axis))) *
this.options.realMax[axis];
-
+ _axis: function() {
+ var axis = this.options.axis;
+ if (axis != 'horizontal' && axis != 'vertical')
+ axis = 'horizontal';
+
+ return axis;
},
- _translateValue: function(value,axis) {
-
- return ((value - this.options.min[axis]) / this.options.realMax[axis]) *
(this.actualSize[axis == "x" ? "width" : "height"] -
this._handleSize(null,axis));
+ _step: function() {
+ var step = this.options.step;
+ return step;
},
- _translateRange: function(value,axis) {
-
- if (this.rangeElement) {
- if (this.currentHandle[0] == this.handle[0] && value >=
this._translateValue(this.value(1),axis))
- value = this._translateValue(this.value(1,axis) - this._oneStep(axis),
axis);
- if (this.currentHandle[0] == this.handle[1] && value <=
this._translateValue(this.value(0),axis))
- value = this._translateValue(this.value(0,axis) + this._oneStep(axis),
axis);
- }
-
- if (this.options.handles) {
- var handle = this.options.handles[this._handleIndex()];
- if (value < this._translateValue(handle.min,axis)) {
- value = this._translateValue(handle.min,axis);
- } else if (value > this._translateValue(handle.max,axis)) {
- value = this._translateValue(handle.max,axis);
- }
- }
-
- return value;
+ _value: function() {
+ var val = this.options.value;
+ if (val < this._valueMin()) val = this._valueMin();
+ if (val > this._valueMax()) val = this._valueMax();
+ return val;
},
- _translateLimits: function(value,axis) {
-
- if (value >= this.actualSize[axis == "x" ? "width" : "height"] -
this._handleSize(null,axis))
- value = this.actualSize[axis == "x" ? "width" : "height"] -
this._handleSize(null,axis);
-
- if (value <= 0)
- value = 0;
-
- return value;
-
- },
-
- _handleSize: function(handle,axis) {
-
-