From 1dc4d64dd4f343031a6851494ae7839873462252 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Scott=20Gonz=C3=A1lez?= Date: Sat, 15 Jan 2011 08:28:13 -0500 Subject: [PATCH] Spinner: Moved ARIA to input and fixed tests. --- tests/unit/spinner/spinner.html | 2 +- tests/unit/spinner/spinner_core.js | 17 ++++++++--------- tests/unit/spinner/spinner_defaults.js | 1 + ui/jquery.ui.spinner.js | 9 +++++++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html index cac598248..ac90dcf6a 100644 --- a/tests/unit/spinner/spinner.html +++ b/tests/unit/spinner/spinner.html @@ -27,7 +27,7 @@ -

jQuery UI Slider Test Suite

+

jQuery UI Spinner Test Suite

    diff --git a/tests/unit/spinner/spinner_core.js b/tests/unit/spinner/spinner_core.js index 88603708f..df2243adc 100644 --- a/tests/unit/spinner/spinner_core.js +++ b/tests/unit/spinner/spinner_core.js @@ -150,22 +150,21 @@ test("reading HTML5 attributes", function() { }); test("ARIA attributes", function() { - var el = $('#spin').spinner({ min: -5, max: 5, value: 2 }), - wrapper = el.spinner("widget"); + var el = $('#spin').spinner({ min: -5, max: 5, value: 2 });; - equals(wrapper.attr('role'), 'spinbutton', 'role'); - equals(wrapper.attr('aria-valuemin'), -5, 'aria-valuemin'); - equals(wrapper.attr('aria-valuemax'), 5, 'aria-valuemax'); - equals(wrapper.attr('aria-valuenow'), 2, 'aria-valuenow'); + equals(el.attr('role'), 'spinbutton', 'role'); + equals(el.attr('aria-valuemin'), -5, 'aria-valuemin'); + equals(el.attr('aria-valuemax'), 5, 'aria-valuemax'); + equals(el.attr('aria-valuenow'), 2, 'aria-valuenow'); el.spinner('stepUp'); - equals(wrapper.attr('aria-valuenow'), 3, 'stepUp 1 step changes aria-valuenow'); + equals(el.attr('aria-valuenow'), 3, 'stepUp 1 step changes aria-valuenow'); el.spinner('option', { min: -10, max: 10 }); - equals(wrapper.attr('aria-valuemin'), -10, 'min option changed aria-valuemin changes'); - equals(wrapper.attr('aria-valuemax'), 10, 'max option changed aria-valuemax changes'); + equals(el.attr('aria-valuemin'), -10, 'min option changed aria-valuemin changes'); + equals(el.attr('aria-valuemax'), 10, 'max option changed aria-valuemax changes'); }); })(jQuery); diff --git a/tests/unit/spinner/spinner_defaults.js b/tests/unit/spinner/spinner_defaults.js index 2f5d77585..0389ab169 100644 --- a/tests/unit/spinner/spinner_defaults.js +++ b/tests/unit/spinner/spinner_defaults.js @@ -8,6 +8,7 @@ var spinner_defaults = { max: null, min: null, numberformat: null, + page: 10, step: null, value: null }; diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index 4a50b7144..702e549ff 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -69,6 +69,7 @@ $.widget('ui.spinner', { }); this.element + .attr( "role", "spinbutton" ) .bind('keydown.spinner', function(event) { if (self.options.disabled) { return; @@ -198,7 +199,7 @@ $.widget('ui.spinner', { }, _uiSpinnerHtml: function() { - return ''; + return ''; }, _buttonHtml: function() { @@ -324,7 +325,11 @@ $.widget('ui.spinner', { this.element .removeClass('ui-spinner-input') .removeAttr('disabled') - .removeAttr('autocomplete'); + .removeAttr('autocomplete') + .removeAttr('role') + .removeAttr('aria-valuemin') + .removeAttr('aria-valuemax') + .removeAttr('aria-valuenow'); this._super( "destroy" ); this.uiSpinner.replaceWith(this.element); }, -- 2.39.5