r2564 - Added value method for getting/setting value, mousewheel option to enable/disable mousewh...
Author: btburnett3
Date: Wed May 13 20:45:34 2009
New Revision: 2564
Modified:
branches/dev/spinner/demos/spinner/default.html
branches/dev/spinner/ui/ui.spinner.js
Log:
Added value method for getting/setting value, mousewheel option to
enable/disable mousewheel even if plugin is present
Modified: branches/dev/spinner/demos/spinner/default.html
==============================================================================
--- branches/dev/spinner/demos/spinner/default.html (original)
+++ branches/dev/spinner/demos/spinner/default.html Wed May 13 20:45:34 2009
@@ -4,7 +4,7 @@
<title>jQuery UI Spinner - Default functionality</title>
<link type="text/css" href="../../themes/base/ui.all.css"
rel="stylesheet" />
<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
- <script type="text/javascript"
src="../../external2/mousewheel/jquery.mousewheel.min.js"></script>
+ <script type="text/javascript"
src="../../external/mousewheel/jquery.mousewheel.min.js"></script>
<script type="text/javascript" src="../../ui/ui.core.js"></script>
<script type="text/javascript" src="../../ui/ui.spinner.js"></script>
<link type="text/css" href="../demos.css" rel="stylesheet" />
@@ -22,6 +22,12 @@
}, function() {
$("#s1").spinner();
});
+ $("#getvalue").click(function() {
+ alert($("#s1").spinner("value"));
+ });
+ $("#setvalue").click(function() {
+ $("#s1").spinner("value", 5);
+ });
$(".ui-button").hover(function() {
$(this).addClass("ui-state-hover");
@@ -41,6 +47,11 @@
<button id="disable" class="ui-button ui-state-default
ui-corner-all">Toggle disable/enable</button>
<button id="destroy" class="ui-button ui-state-default
ui-corner-all">Toggle widget</button>
+
+
+
+<button id="getvalue" class="ui-button ui-state-default ui-corner-all">Get
value</button>
+<button id="setvalue" class="ui-button ui-state-default ui-corner-all">Set
value to 5</button>
</div><!-- End demo -->
Modified: branches/dev/spinner/ui/ui.spinner.js
==============================================================================
--- branches/dev/spinner/ui/ui.spinner.js (original)
+++ branches/dev/spinner/ui/ui.spinner.js Wed May 13 20:45:34 2009
@@ -286,14 +286,17 @@
},
_mousewheel: function(event, delta) {
var self = this;
- delta = ($.browser.opera ? -delta / Math.abs(delta) : delta);
- (delta > 0 ? self._up(event) : self._down(event));
- if (self.timeout) {
- window.clearTimeout(self.timeout);
- self.timeout = 0;
+
+ if (self.options.mouseWheel) {
+ delta = ($.browser.opera ? -delta / Math.abs(delta) : delta);
+ (delta > 0 ? self._up(event) : self._down(event));
+ if (self.timeout) {
+ window.clearTimeout(self.timeout);
+ self.timeout = 0;
+ }
+ self.timeout = window.setTimeout(function(){self._trigger('change',
event);}, 400);
+ event.preventDefault();
}
- self.timeout = window.setTimeout(function(){self._trigger('change',
event);}, 400);
- event.preventDefault();
},
_getValue: function() {
var val = this.element.val().replace(this.options.point, '.');
@@ -348,7 +351,7 @@
this.element.append('<'+ wrapper +' class="ui-spinner-dyn">'+ html
+ '</'+ wrapper +'>');
}
},
-
+
plugins: {},
ui: function(event) {
return {
@@ -405,16 +408,23 @@
.parent()
.addClass('ui-state-disabled');
this.disabled = true;
+ },
+ value: function(newVal) {
+ if (arguments.length)
+ this._setValue(newVal);
+ return this._getValue();
}
});
$.extend($.ui.spinner, {
version: "@VERSION",
+ getter: 'value',
defaults: {
decimals: 0,
stepping: 1,
start: 0,
incremental: true,
+ mouseWheel: true,
currency: false,
format: '%',
group: '',
@@ -422,7 +432,7 @@
items: null,
max: null,
min: null,
- width: 'auto'
+ width: 'auto'
},
format: {
currency: function(num, sym, group, pt) {
Topic Participants
scott.gonzalez