From 8ce35198daf261370e2962f4c429bf4fa998b2df Mon Sep 17 00:00:00 2001 From: David Petersen Date: Tue, 16 Oct 2012 12:16:13 -0400 Subject: Tabs: Remove anchor clone in isLocal. Fixed #8653 - Tabs are not working inside iframe in IE6/7. --- ui/jquery.ui.tabs.js | 3 --- 1 file changed, 3 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 7d38fb46e..0d7f85fbc 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -22,9 +22,6 @@ function getNextTabId() { } function isLocal( anchor ) { - // clone the node to work around IE 6 not normalizing the href property - // if it's manually set, i.e., a.href = "#foo" kills the normalization - anchor = anchor.cloneNode( false ); return anchor.hash.length > 1 && anchor.href.replace( rhash, "" ) === location.href.replace( rhash, "" ); } -- cgit v1.2.3 From eb4178f81910ec691f0bfe93d6002a76854bdde5 Mon Sep 17 00:00:00 2001 From: Scott González Date: Sun, 21 Oct 2012 17:50:13 -0400 Subject: Fixed some jshint errors. --- ui/jquery.ui.effect.js | 2 +- ui/jquery.ui.tabs.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/ui/jquery.ui.effect.js b/ui/jquery.ui.effect.js index 3fb428c1a..8d875746e 100644 --- a/ui/jquery.ui.effect.js +++ b/ui/jquery.ui.effect.js @@ -619,7 +619,7 @@ each( stepHooks, function( i, hook ) { } try { elem.style[ hook ] = value; - } catch( value ) { + } catch( error ) { // wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit' } } diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 0d7f85fbc..05456374d 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -895,16 +895,16 @@ if ( $.uiBackCompat !== false ) { _ajaxSettings: function( anchor, event, ui ) { var ajaxOptions = this.options.ajaxOptions; return $.extend( {}, ajaxOptions, { - error: function( xhr, s, e ) { + error: function( xhr, status ) { try { // Passing index avoid a race condition when this method is // called after the user has selected another tab. // Pass the anchor that initiated this request allows // loadError to manipulate the tab content panel via $(a.hash) ajaxOptions.error( - xhr, s, ui.tab.closest( "li" ).index(), ui.tab[ 0 ] ); + xhr, status, ui.tab.closest( "li" ).index(), ui.tab[ 0 ] ); } - catch ( e ) {} + catch ( error ) {} } }, this._superApply( arguments ) ); }, -- cgit v1.2.3 From e1230997aa14dae6f35326c8ba20bfe2428507c2 Mon Sep 17 00:00:00 2001 From: Mike Sherov Date: Tue, 23 Oct 2012 09:36:42 -0500 Subject: Build: Enable "unused" option in jshint - Remove unused variables from codebase. - Closes gh-788 Squashed commit of the following: commit 7f19f92c646f180bc067bb24123175251a64a9d6 Author: Mike Sherov Date: Tue Oct 23 10:34:28 2012 -0400 put back in fake args for signatures that we want to keep commit 257505a9e69da0c53e3a989dab87a13112045a29 Author: Mike Sherov Date: Tue Oct 23 08:10:20 2012 -0400 changes per @scott_gonzalez commit 12725480cb58e70865e5aa6e735009b6b035c8f3 Author: Mike Sherov Date: Mon Oct 22 22:54:05 2012 -0400 clean up unused vars in ui directory commit 563595e7aee5d4a5c096b2d1de655abdf920aacd Author: Mike Sherov Date: Mon Oct 22 22:37:42 2012 -0400 clean up unused vars in grunt and tests --- .jshintrc | 3 +- build/release/release.js | 2 +- build/tasks/build.js | 2 +- tests/.jshintrc | 12 +----- tests/unit/autocomplete/autocomplete_core.js | 3 +- tests/unit/autocomplete/autocomplete_events.js | 6 +-- tests/unit/autocomplete/autocomplete_options.js | 2 +- tests/unit/button/button_events.js | 2 +- tests/unit/datepicker/datepicker_core.js | 18 ++------- tests/unit/datepicker/datepicker_defaults.js | 4 +- tests/unit/datepicker/datepicker_events.js | 6 +-- tests/unit/datepicker/datepicker_methods.js | 20 +++++----- tests/unit/datepicker/datepicker_options.js | 24 ++++-------- tests/unit/datepicker/datepicker_tickets.js | 2 +- tests/unit/dialog/dialog_core.js | 48 ++++++++++------------- tests/unit/dialog/dialog_events.js | 6 +-- tests/unit/dialog/dialog_methods.js | 2 +- tests/unit/dialog/dialog_options.js | 30 +++++++------- tests/unit/dialog/dialog_tickets.js | 8 ++-- tests/unit/draggable/draggable_core.js | 5 +-- tests/unit/draggable/draggable_options.js | 44 ++++++++++----------- tests/unit/droppable/droppable_core.js | 12 +++--- tests/unit/droppable/droppable_events.js | 4 ++ tests/unit/droppable/droppable_methods.js | 16 ++++---- tests/unit/effects/effects_core.js | 14 +++---- tests/unit/menu/menu_events.js | 30 +++++++------- tests/unit/menu/menu_methods.js | 2 +- tests/unit/menu/menu_options.js | 4 +- tests/unit/resizable/resizable_core.js | 36 ++++++++--------- tests/unit/resizable/resizable_events.js | 4 ++ tests/unit/resizable/resizable_methods.js | 3 ++ tests/unit/resizable/resizable_options.js | 52 ++++++++++++------------- tests/unit/selectable/selectable_core.js | 2 +- tests/unit/selectable/selectable_events.js | 4 +- tests/unit/selectable/selectable_methods.js | 2 +- tests/unit/selectable/selectable_options.js | 8 ++-- tests/unit/slider/slider_events.js | 24 ++++++------ tests/unit/slider/slider_methods.js | 4 +- tests/unit/sortable/sortable_core.js | 4 ++ tests/unit/sortable/sortable_options.js | 4 ++ tests/unit/sortable/sortable_tickets.js | 6 +-- tests/unit/spinner/spinner_options.js | 6 +-- tests/unit/tabs/tabs_core.js | 5 +-- tests/unit/tabs/tabs_deprecated.js | 16 ++++---- tests/unit/testsuite.js | 4 +- tests/unit/tooltip/tooltip_options.js | 2 +- tests/unit/widget/widget_core.js | 8 ++-- ui/.jshintrc | 1 + ui/jquery.ui.accordion.js | 2 +- ui/jquery.ui.autocomplete.js | 4 +- ui/jquery.ui.dialog.js | 28 +++++++------ ui/jquery.ui.effect.js | 11 ++---- ui/jquery.ui.slider.js | 4 +- ui/jquery.ui.tabs.js | 12 +++--- ui/jquery.ui.tooltip.js | 4 +- ui/jquery.ui.widget.js | 2 +- 56 files changed, 282 insertions(+), 311 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/.jshintrc b/.jshintrc index e22109220..d6966c51d 100644 --- a/.jshintrc +++ b/.jshintrc @@ -7,5 +7,6 @@ "node": true, "onevar": true, "trailing": true, - "undef": true + "undef": true, + "unused": true } diff --git a/build/release/release.js b/build/release/release.js index ae705a90f..2227bf0e6 100644 --- a/build/release/release.js +++ b/build/release/release.js @@ -425,7 +425,7 @@ function abort( msg ) { function walk( methods ) { var method = methods.shift(); - function next( error ) { + function next() { if ( methods.length ) { walk( methods ); } diff --git a/build/tasks/build.js b/build/tasks/build.js index b59c728d3..18e427a56 100644 --- a/build/tasks/build.js +++ b/build/tasks/build.js @@ -146,7 +146,7 @@ grunt.registerMultiTask( "zip", "Create a zip file for release", function() { opts: { cwd: 'dist' } - }, function( err, result ) { + }, function( err ) { if ( err ) { grunt.log.error( err ); done(); diff --git a/tests/.jshintrc b/tests/.jshintrc index 20094d436..c0f0f8d53 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -11,8 +11,8 @@ "onevar": true, "trailing": true, "undef": true, + "unused": true, "predef": [ - "addMonths", "asyncTest", "container", "deepEqual", @@ -29,8 +29,6 @@ "Globalize", "heightAfter", "init", - "isNotOpen", - "isOpen", "modal", "module", "moved", @@ -38,15 +36,7 @@ "offsetAfter", "offsetBefore", "ok", - "PROP_NAME", "QUnit", - "restoreScroll", - "shouldBeDroppable", - "shouldmove", - "shouldNotBeDroppable", - "shouldnotmove", - "shouldnotresize", - "shouldresize", "start", "strictEqual", "stop", diff --git a/tests/unit/autocomplete/autocomplete_core.js b/tests/unit/autocomplete/autocomplete_core.js index f0ad36a57..f2062cacd 100644 --- a/tests/unit/autocomplete/autocomplete_core.js +++ b/tests/unit/autocomplete/autocomplete_core.js @@ -109,8 +109,7 @@ test( "allow form submit on enter when menu is not active", function() { function arrowsMoveFocus( id, isKeyUp ) { expect( 1 ); - var didMove = false, - element = $( id ).autocomplete({ + var element = $( id ).autocomplete({ source: [ "a" ], delay: 0, minLength: 0 diff --git a/tests/unit/autocomplete/autocomplete_events.js b/tests/unit/autocomplete/autocomplete_events.js index 082263a35..fb1cf73a6 100644 --- a/tests/unit/autocomplete/autocomplete_events.js +++ b/tests/unit/autocomplete/autocomplete_events.js @@ -39,7 +39,7 @@ $.each([ ], "response ui.content" ); ui.content.splice( 0, 1 ); }, - open: function( event ) { + open: function() { ok( menu.is( ":visible" ), "menu open on open" ); }, focus: function( event, ui ) { @@ -127,7 +127,7 @@ asyncTest( "cancel focus", function() { element = $( "#autocomplete" ).autocomplete({ delay: 0, source: data, - focus: function( event, ui ) { + focus: function() { $( this ).val( customVal ); return false; } @@ -146,7 +146,7 @@ asyncTest( "cancel select", function() { element = $( "#autocomplete" ).autocomplete({ delay: 0, source: data, - select: function( event, ui ) { + select: function() { $( this ).val( customVal ); return false; } diff --git a/tests/unit/autocomplete/autocomplete_options.js b/tests/unit/autocomplete/autocomplete_options.js index 1ab40f36c..8331c53d5 100644 --- a/tests/unit/autocomplete/autocomplete_options.js +++ b/tests/unit/autocomplete/autocomplete_options.js @@ -33,7 +33,7 @@ function autoFocusTest( afValue, focusedLength ) { autoFocus: afValue, delay: 0, source: data, - open: function( event, ui ) { + open: function() { equal( element.autocomplete( "widget" ).children( ".ui-menu-item:first" ).find( ".ui-state-focus" ).length, focusedLength, "first item is " + (afValue ? "" : "not") + " auto focused" ); start(); diff --git a/tests/unit/button/button_events.js b/tests/unit/button/button_events.js index a2154021d..40d2a1a96 100644 --- a/tests/unit/button/button_events.js +++ b/tests/unit/button/button_events.js @@ -1,7 +1,7 @@ /* * button_events.js */ -(function($) { +(function() { module("button: events"); diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js index e17b239e5..4abdfd106 100644 --- a/tests/unit/datepicker/datepicker_core.js +++ b/tests/unit/datepicker/datepicker_core.js @@ -12,31 +12,19 @@ function equalsDate(d1, d2, message) { equal(d1.toString(), d2.toString(), message); } -function equalsDateArray(a1, a2, message) { - if (!a1 || !a2) { - ok(false, message + ' - missing dates'); - return; - } - a1[0] = (a1[0] ? new Date(a1[0].getFullYear(), a1[0].getMonth(), a1[0].getDate()) : ''); - a1[1] = (a1[1] ? new Date(a1[1].getFullYear(), a1[1].getMonth(), a1[1].getDate()) : ''); - a2[0] = (a2[0] ? new Date(a2[0].getFullYear(), a2[0].getMonth(), a2[0].getDate()) : ''); - a2[1] = (a2[1] ? new Date(a2[1].getFullYear(), a2[1].getMonth(), a2[1].getDate()) : ''); - deepEqual(a1, a2, message); -} - -function addMonths(date, offset) { +TestHelpers.addMonths = function(date, offset) { var maxDay = 32 - new Date(date.getFullYear(), date.getMonth() + offset, 32).getDate(); date.setDate(Math.min(date.getDate(), maxDay)); date.setMonth(date.getMonth() + offset); return date; -} +}; function init(id, options) { $.datepicker.setDefaults($.datepicker.regional['']); return $(id).datepicker($.extend({showAnim: ''}, options || {})); } -var PROP_NAME = 'datepicker'; +TestHelpers.PROP_NAME = 'datepicker'; (function($) { diff --git a/tests/unit/datepicker/datepicker_defaults.js b/tests/unit/datepicker/datepicker_defaults.js index 28e150791..1e7d90852 100644 --- a/tests/unit/datepicker/datepicker_defaults.js +++ b/tests/unit/datepicker/datepicker_defaults.js @@ -2,8 +2,10 @@ * datepicker_defaults.js */ +/* var datepicker_defaults = { disabled: false }; -//TestHelpers.commonWidgetTests('datepicker', { defaults: datepicker_defaults }); +TestHelpers.commonWidgetTests('datepicker', { defaults: datepicker_defaults }); +*/ diff --git a/tests/unit/datepicker/datepicker_events.js b/tests/unit/datepicker/datepicker_events.js index e35be62ce..b71067472 100644 --- a/tests/unit/datepicker/datepicker_events.js +++ b/tests/unit/datepicker/datepicker_events.js @@ -30,7 +30,7 @@ test('events', function() { inp.val('').datepicker('show'). simulate('keydown', {keyCode: $.ui.keyCode.ENTER}); equal(selectedThis, inp[0], 'Callback selected this'); - equal(selectedInst, $.data(inp[0], PROP_NAME), 'Callback selected inst'); + equal(selectedInst, $.data(inp[0], TestHelpers.PROP_NAME), 'Callback selected inst'); equal(selectedDate, $.datepicker.formatDate('mm/dd/yy', date), 'Callback selected date'); inp.val('').datepicker('show'). @@ -59,7 +59,7 @@ test('events', function() { inp.simulate('keydown', {keyCode: $.ui.keyCode.PAGE_UP}); date.setMonth(date.getMonth() - 1); equal(selectedThis, inp[0], 'Callback change month/year this'); - equal(selectedInst, $.data(inp[0], PROP_NAME), 'Callback change month/year inst'); + equal(selectedInst, $.data(inp[0], TestHelpers.PROP_NAME), 'Callback change month/year inst'); equal(selectedDate, newMonthYear(date), 'Callback change month/year date - pgup'); inp.simulate('keydown', {keyCode: $.ui.keyCode.PAGE_DOWN}); @@ -107,7 +107,7 @@ test('events', function() { val('').datepicker('show'). simulate('keydown', {keyCode: $.ui.keyCode.ESCAPE}); equal(selectedThis, inp[0], 'Callback close this'); - equal(selectedInst, $.data(inp[0], PROP_NAME), 'Callback close inst'); + equal(selectedInst, $.data(inp[0], TestHelpers.PROP_NAME), 'Callback close inst'); equal(selectedDate, '', 'Callback close date - esc'); inp.val('').datepicker('show'). simulate('keydown', {keyCode: $.ui.keyCode.ENTER}); diff --git a/tests/unit/datepicker/datepicker_methods.js b/tests/unit/datepicker/datepicker_methods.js index e7aa7602e..5e692d1a0 100644 --- a/tests/unit/datepicker/datepicker_methods.js +++ b/tests/unit/datepicker/datepicker_methods.js @@ -10,56 +10,56 @@ test('destroy', function() { var inl, inp = init('#inp'); ok(inp.is('.hasDatepicker'), 'Default - marker class set'); - ok($.data(inp[0], PROP_NAME), 'Default - instance present'); + ok($.data(inp[0], TestHelpers.PROP_NAME), 'Default - instance present'); ok(inp.next().is('#alt'), 'Default - button absent'); inp.datepicker('destroy'); inp = $('#inp'); ok(!inp.is('.hasDatepicker'), 'Default - marker class cleared'); - ok(!$.data(inp[0], PROP_NAME), 'Default - instance absent'); + ok(!$.data(inp[0], TestHelpers.PROP_NAME), 'Default - instance absent'); ok(inp.next().is('#alt'), 'Default - button absent'); // With button inp= init('#inp', {showOn: 'both'}); ok(inp.is('.hasDatepicker'), 'Button - marker class set'); - ok($.data(inp[0], PROP_NAME), 'Button - instance present'); + ok($.data(inp[0], TestHelpers.PROP_NAME), 'Button - instance present'); ok(inp.next().text() === '...', 'Button - button added'); inp.datepicker('destroy'); inp = $('#inp'); ok(!inp.is('.hasDatepicker'), 'Button - marker class cleared'); - ok(!$.data(inp[0], PROP_NAME), 'Button - instance absent'); + ok(!$.data(inp[0], TestHelpers.PROP_NAME), 'Button - instance absent'); ok(inp.next().is('#alt'), 'Button - button removed'); // With append text inp = init('#inp', {appendText: 'Testing'}); ok(inp.is('.hasDatepicker'), 'Append - marker class set'); - ok($.data(inp[0], PROP_NAME), 'Append - instance present'); + ok($.data(inp[0], TestHelpers.PROP_NAME), 'Append - instance present'); ok(inp.next().text() === 'Testing', 'Append - append text added'); inp.datepicker('destroy'); inp = $('#inp'); ok(!inp.is('.hasDatepicker'), 'Append - marker class cleared'); - ok(!$.data(inp[0], PROP_NAME), 'Append - instance absent'); + ok(!$.data(inp[0], TestHelpers.PROP_NAME), 'Append - instance absent'); ok(inp.next().is('#alt'), 'Append - append text removed'); // With both inp= init('#inp', {showOn: 'both', buttonImageOnly: true, buttonImage: 'img/calendar.gif', appendText: 'Testing'}); ok(inp.is('.hasDatepicker'), 'Both - marker class set'); - ok($.data(inp[0], PROP_NAME), 'Both - instance present'); + ok($.data(inp[0], TestHelpers.PROP_NAME), 'Both - instance present'); ok(inp.next()[0].nodeName.toLowerCase() === 'img', 'Both - button added'); ok(inp.next().next().text() === 'Testing', 'Both - append text added'); inp.datepicker('destroy'); inp = $('#inp'); ok(!inp.is('.hasDatepicker'), 'Both - marker class cleared'); - ok(!$.data(inp[0], PROP_NAME), 'Both - instance absent'); + ok(!$.data(inp[0], TestHelpers.PROP_NAME), 'Both - instance absent'); ok(inp.next().is('#alt'), 'Both - button and append text absent'); // Inline inl = init('#inl'); ok(inl.is('.hasDatepicker'), 'Inline - marker class set'); ok(inl.html() !== '', 'Inline - datepicker present'); - ok($.data(inl[0], PROP_NAME), 'Inline - instance present'); + ok($.data(inl[0], TestHelpers.PROP_NAME), 'Inline - instance present'); ok(inl.next().length === 0 || inl.next().is('p'), 'Inline - button absent'); inl.datepicker('destroy'); inl = $('#inl'); ok(!inl.is('.hasDatepicker'), 'Inline - marker class cleared'); ok(inl.html() === '', 'Inline - datepicker absent'); - ok(!$.data(inl[0], PROP_NAME), 'Inline - instance absent'); + ok(!$.data(inl[0], TestHelpers.PROP_NAME), 'Inline - instance absent'); ok(inl.next().length === 0 || inl.next().is('p'), 'Inline - button absent'); }); diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js index a01b9c7e0..7d3217364 100644 --- a/tests/unit/datepicker/datepicker_options.js +++ b/tests/unit/datepicker/datepicker_options.js @@ -8,7 +8,7 @@ module("datepicker: options"); test('setDefaults', function() { expect( 3 ); - var inp = init('#inp'); + init('#inp'); equal($.datepicker._defaults.showOn, 'focus', 'Initial showOn'); $.datepicker.setDefaults({showOn: 'button'}); equal($.datepicker._defaults.showOn, 'button', 'Change default showOn'); @@ -19,7 +19,7 @@ test('setDefaults', function() { test('option', function() { expect( 17 ); var inp = init('#inp'), - inst = $.data(inp[0], PROP_NAME); + inst = $.data(inp[0], TestHelpers.PROP_NAME); // Set option equal(inst.settings.showOn, null, 'Initial setting showOn'); equal($.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance showOn'); @@ -51,7 +51,7 @@ test('option', function() { test('change', function() { expect( 12 ); var inp = init('#inp'), - inst = $.data(inp[0], PROP_NAME); + inst = $.data(inp[0], TestHelpers.PROP_NAME); equal(inst.settings.showOn, null, 'Initial setting showOn'); equal($.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance showOn'); equal($.datepicker._defaults.showOn, 'focus', 'Initial default showOn'); @@ -215,12 +215,12 @@ test('defaultDate', function() { inp.datepicker('option', {defaultDate: ' -1 m '}). datepicker('hide').val('').datepicker('show'). simulate('keydown', {keyCode: $.ui.keyCode.ENTER}); - date = addMonths(new Date(), -1); + date = TestHelpers.addMonths(new Date(), -1); equalsDate(inp.datepicker('getDate'), date, 'Default date -1 m'); inp.datepicker('option', {defaultDate: '+2M'}). datepicker('hide').val('').datepicker('show'). simulate('keydown', {keyCode: $.ui.keyCode.ENTER}); - date = addMonths(new Date(), 2); + date = TestHelpers.addMonths(new Date(), 2); equalsDate(inp.datepicker('getDate'), date, 'Default date +2M'); inp.datepicker('option', {defaultDate: '-2y'}). datepicker('hide').val('').datepicker('show'). @@ -236,7 +236,7 @@ test('defaultDate', function() { inp.datepicker('option', {defaultDate: '+1M +10d'}). datepicker('hide').val('').datepicker('show'). simulate('keydown', {keyCode: $.ui.keyCode.ENTER}); - date = addMonths(new Date(), 1); + date = TestHelpers.addMonths(new Date(), 1); date.setDate(date.getDate() + 10); equalsDate(inp.datepicker('getDate'), date, 'Default date +1M +10d'); // String date values @@ -380,7 +380,7 @@ test('minMax', function() { simulate('keydown', {keyCode: $.ui.keyCode.ENTER}); equalsDate(inp.datepicker('getDate'), date, 'Min/max - -1w, +1 M +10 D - ctrl+pgup'); - date = addMonths(new Date(), 1); + date = TestHelpers.addMonths(new Date(), 1); date.setDate(date.getDate() + 10); inp.val('').datepicker('show'); inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}). @@ -665,16 +665,6 @@ function beforeDay(date) { (date.getDate() % 3 === 0 ? 'Divisble by 3' : '')]; } -function calcWeek(date) { - var doy = date.getDate() + 6, - m = date.getMonth() - 1; - for (; m >= 0; m--) { - doy += $.datepicker._getDaysInMonth(date.getFullYear(), m); - } - // Simple count from 01/01 starting at week 1 - return Math.floor(doy / 7); -} - test('callbacks', function() { expect( 13 ); // Before show diff --git a/tests/unit/datepicker/datepicker_tickets.js b/tests/unit/datepicker/datepicker_tickets.js index 57b25c3ff..ff5dfde63 100644 --- a/tests/unit/datepicker/datepicker_tickets.js +++ b/tests/unit/datepicker/datepicker_tickets.js @@ -8,7 +8,7 @@ module("datepicker: tickets"); // http://forum.jquery.com/topic/several-breaking-changes-in-jquery-ui-1-8rc1 test('beforeShowDay-getDate', function() { expect( 3 ); - var inp = init('#inp', {beforeShowDay: function(date) { inp.datepicker('getDate'); return [true, '']; }}), + var inp = init('#inp', {beforeShowDay: function() { inp.datepicker('getDate'); return [true, '']; }}), dp = $('#ui-datepicker-div'); inp.val('01/01/2010').datepicker('show'); // contains non-breaking space diff --git a/tests/unit/dialog/dialog_core.js b/tests/unit/dialog/dialog_core.js index e0a5c8701..a9e5e9be2 100644 --- a/tests/unit/dialog/dialog_core.js +++ b/tests/unit/dialog/dialog_core.js @@ -12,13 +12,13 @@ function dlg() { return el.dialog('widget'); } -function isOpen(why) { +TestHelpers.isOpen = function(why) { ok(dlg().is(":visible"), why); -} +}; -function isNotOpen(why) { +TestHelpers.isNotOpen = function(why) { ok(!dlg().is(":visible"), why); -} +}; function drag(handle, dx, dy) { var d = dlg(); @@ -38,51 +38,43 @@ function drag(handle, dx, dy) { widthAfter = d.width(); } -function moved(dx, dy, msg) { +TestHelpers.dialogMoved = function(dx, dy, msg) { msg = msg ? msg + "." : ""; var actual = { left: Math.round(offsetAfter.left), top: Math.round(offsetAfter.top) }, expected = { left: Math.round(offsetBefore.left + dx), top: Math.round(offsetBefore.top + dy) }; deepEqual(actual, expected, 'dragged[' + dragged.dx + ', ' + dragged.dy + '] ' + msg); -} +}; -function shouldmove(why) { +TestHelpers.shouldmove = function(why) { var handle = $(".ui-dialog-titlebar", dlg()); drag(handle, 50, -50); - moved(50, -50, why); -} + TestHelpers.dialogMoved(50, -50, why); +}; -function shouldnotmove(why) { +TestHelpers.shouldnotmove = function(why) { var handle = $(".ui-dialog-titlebar", dlg()); drag(handle, 50, -50); - moved(0, 0, why); -} + TestHelpers.dialogMoved(0, 0, why); +}; -function resized(dw, dh, msg) { +TestHelpers.resized = function(dw, dh, msg) { msg = msg ? msg + "." : ""; var actual = { width: widthAfter, height: heightAfter }, expected = { width: widthBefore + dw, height: heightBefore + dh }; deepEqual(actual, expected, 'resized[' + dragged.dx + ', ' + dragged.dy + '] ' + msg); -} +}; -function shouldresize(why) { +TestHelpers.shouldresize = function(why) { var handle = $(".ui-resizable-se", dlg()); drag(handle, 50, 50); - resized(50, 50, why); -} + TestHelpers.resized(50, 50, why); +}; -function shouldnotresize(why) { +TestHelpers.shouldnotresize = function(why) { var handle = $(".ui-resizable-se", dlg()); drag(handle, 50, 50); - resized(0, 0, why); -} - -function broder(el, side){ - return parseInt(el.css('border-' + side + '-width'), 10); -} - -function margin(el, side) { - return parseInt(el.css('margin-' + side), 10); -} + TestHelpers.resized(0, 0, why); +}; (function($) { diff --git a/tests/unit/dialog/dialog_events.js b/tests/unit/dialog/dialog_events.js index 515bebdc1..38b75a714 100644 --- a/tests/unit/dialog/dialog_events.js +++ b/tests/unit/dialog/dialog_events.js @@ -244,7 +244,7 @@ test("beforeClose", function() { } }); el.dialog('close'); - isOpen('beforeClose callback should prevent dialog from closing'); + TestHelpers.isOpen('beforeClose callback should prevent dialog from closing'); el.remove(); el = $('
').dialog(); @@ -256,7 +256,7 @@ test("beforeClose", function() { return false; }); el.dialog('close'); - isOpen('beforeClose callback should prevent dialog from closing'); + TestHelpers.isOpen('beforeClose callback should prevent dialog from closing'); el.remove(); el = $('
').dialog().bind('dialogbeforeclose', function(ev, ui) { @@ -266,7 +266,7 @@ test("beforeClose", function() { return false; }); el.dialog('close'); - isOpen('dialogbeforeclose event should prevent dialog from closing'); + TestHelpers.isOpen('dialogbeforeclose event should prevent dialog from closing'); el.remove(); }); diff --git a/tests/unit/dialog/dialog_methods.js b/tests/unit/dialog/dialog_methods.js index ba0c2bd41..3c80a9bea 100644 --- a/tests/unit/dialog/dialog_methods.js +++ b/tests/unit/dialog/dialog_methods.js @@ -25,7 +25,7 @@ test("init", function() { ok(true, '.dialog() called on disconnected DOMElement - removed'); el = $('
').dialog(); - var foo = el.dialog("option", "foo"); + el.dialog("option", "foo"); el.remove(); ok(true, 'arbitrary option getter after init'); diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js index ba217c6f4..1c823868e 100644 --- a/tests/unit/dialog/dialog_options.js +++ b/tests/unit/dialog/dialog_options.js @@ -9,11 +9,11 @@ test("autoOpen", function() { expect(2); el = $('
').dialog({ autoOpen: false }); - isNotOpen('.dialog({ autoOpen: false })'); + TestHelpers.isNotOpen('.dialog({ autoOpen: false })'); el.remove(); el = $('
').dialog({ autoOpen: true }); - isOpen('.dialog({ autoOpen: true })'); + TestHelpers.isOpen('.dialog({ autoOpen: true })'); el.remove(); }); @@ -22,12 +22,12 @@ test("buttons", function() { var btn, i, newButtons, buttons = { - "Ok": function(ev, ui) { + "Ok": function( ev ) { ok(true, "button click fires callback"); equal(this, el[0], "context of callback"); equal(ev.target, btn[0], "event target"); }, - "Cancel": function(ev, ui) { + "Cancel": function( ev ) { ok(true, "button click fires callback"); equal(this, el[0], "context of callback"); equal(ev.target, btn[1], "event target"); @@ -39,7 +39,7 @@ test("buttons", function() { equal(btn.length, 2, "number of buttons"); i = 0; - $.each(buttons, function(key, val) { + $.each(buttons, function( key ) { equal(btn.eq(i).text(), key, "text of button " + (i+1)); i++; }); @@ -50,7 +50,7 @@ test("buttons", function() { btn.trigger("click"); newButtons = { - "Close": function(ev, ui) { + "Close": function( ev ) { ok(true, "button click fires callback"); equal(this, el[0], "context of callback"); equal(ev.target, btn[0], "event target"); @@ -66,7 +66,7 @@ test("buttons", function() { btn.trigger('click'); i = 0; - $.each(newButtons, function(key, val) { + $.each(newButtons, function( key ) { equal(btn.eq(i).text(), key, "text of button " + (i+1)); i += 1; }); @@ -166,15 +166,15 @@ test("draggable", function() { expect(4); el = $('
').dialog({ draggable: false }); - shouldnotmove(); + TestHelpers.shouldnotmove(); el.dialog('option', 'draggable', true); - shouldmove(); + TestHelpers.shouldmove(); el.remove(); el = $('
').dialog({ draggable: true }); - shouldmove(); + TestHelpers.shouldmove(); el.dialog('option', 'draggable', false); - shouldnotmove(); + TestHelpers.shouldnotmove(); el.remove(); }); @@ -395,15 +395,15 @@ test("resizable", function() { expect(4); el = $('
').dialog(); - shouldresize("[default]"); + TestHelpers.shouldresize("[default]"); el.dialog('option', 'resizable', false); - shouldnotresize('disabled after init'); + TestHelpers.shouldnotresize('disabled after init'); el.remove(); el = $('
').dialog({ resizable: false }); - shouldnotresize("disabled in init options"); + TestHelpers.shouldnotresize("disabled in init options"); el.dialog('option', 'resizable', true); - shouldresize('enabled after init'); + TestHelpers.shouldresize('enabled after init'); el.remove(); }); diff --git a/tests/unit/dialog/dialog_tickets.js b/tests/unit/dialog/dialog_tickets.js index e17d55a15..cf4ab0219 100644 --- a/tests/unit/dialog/dialog_tickets.js +++ b/tests/unit/dialog/dialog_tickets.js @@ -39,18 +39,18 @@ test("#4826: setting resizable false toggles resizable on dialog", function() { var i; el = $('
').dialog({ resizable: false }); - shouldnotresize("[default]"); + TestHelpers.shouldnotresize("[default]"); for (i=0; i<2; i++) { el.dialog('close').dialog('open'); - shouldnotresize('initialized with resizable false toggle ('+ (i+1) +')'); + TestHelpers.shouldnotresize('initialized with resizable false toggle ('+ (i+1) +')'); } el.remove(); el = $('
').dialog({ resizable: true }); - shouldresize("[default]"); + TestHelpers.shouldresize("[default]"); for (i=0; i<2; i++) { el.dialog('close').dialog('option', 'resizable', false).dialog('open'); - shouldnotresize('set option resizable false toggle ('+ (i+1) +')'); + TestHelpers.shouldnotresize('set option resizable false toggle ('+ (i+1) +')'); } el.remove(); diff --git a/tests/unit/draggable/draggable_core.js b/tests/unit/draggable/draggable_core.js index 9193881ad..80d9ca83e 100644 --- a/tests/unit/draggable/draggable_core.js +++ b/tests/unit/draggable/draggable_core.js @@ -5,7 +5,6 @@ var el, offsetBefore, offsetAfter, dragged; function drag(handle, dx, dy) { - var element = el.data("draggable").element; offsetBefore = el.offset(); $(handle).simulate("drag", { dx: dx || 0, @@ -22,8 +21,8 @@ function moved(dx, dy, msg) { deepEqual(actual, expected, 'dragged[' + dragged.dx + ', ' + dragged.dy + '] ' + msg); } -function restoreScroll(what) { - if(what) { +TestHelpers.restoreScroll = function( what ) { + if( what ) { $(document).scrollTop(0); $(document).scrollLeft(0); } else { $("#main")[0].scrollTop = 0; $("#main")[0].scrollLeft = 0; diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js index ea4611d69..4f7781515 100644 --- a/tests/unit/draggable/draggable_options.js +++ b/tests/unit/draggable/draggable_options.js @@ -210,7 +210,7 @@ test("{ cursor: 'auto' }, default", function() { el = $("#draggable2").draggable({ cursor: expected, - start: function(event, ui) { + start: function() { actual = getCursor(); } }); @@ -234,7 +234,7 @@ test("{ cursor: 'move' }", function() { el = $("#draggable2").draggable({ cursor: expected, - start: function(event, ui) { + start: function() { actual = getCursor(); } }); @@ -449,7 +449,7 @@ test("{ helper: 'original' }, relative, with scroll offset on parent", function( setScroll(); testScroll('absolute'); - restoreScroll(); + TestHelpers.restoreScroll(); }); @@ -466,7 +466,7 @@ test("{ helper: 'original' }, relative, with scroll offset on root", function() setScroll('root'); testScroll('absolute'); - restoreScroll('root'); + TestHelpers.restoreScroll('root'); }); @@ -486,8 +486,8 @@ test("{ helper: 'original' }, relative, with scroll offset on root and parent", setScroll('root'); testScroll('absolute'); - restoreScroll(); - restoreScroll('root'); + TestHelpers.restoreScroll(); + TestHelpers.restoreScroll('root'); }); @@ -504,7 +504,7 @@ test("{ helper: 'original' }, absolute, with scroll offset on parent", function( setScroll(); testScroll('absolute'); - restoreScroll(); + TestHelpers.restoreScroll(); }); @@ -521,7 +521,7 @@ test("{ helper: 'original' }, absolute, with scroll offset on root", function() setScroll('root'); testScroll('absolute'); - restoreScroll('root'); + TestHelpers.restoreScroll('root'); }); @@ -541,8 +541,8 @@ test("{ helper: 'original' }, absolute, with scroll offset on root and parent", setScroll('root'); testScroll('absolute'); - restoreScroll(); - restoreScroll('root'); + TestHelpers.restoreScroll(); + TestHelpers.restoreScroll('root'); }); @@ -559,7 +559,7 @@ test("{ helper: 'original' }, fixed, with scroll offset on parent", function() { setScroll(); testScroll('absolute'); - restoreScroll(); + TestHelpers.restoreScroll(); }); @@ -576,7 +576,7 @@ test("{ helper: 'original' }, fixed, with scroll offset on root", function() { setScroll('root'); testScroll('absolute'); - restoreScroll('root'); + TestHelpers.restoreScroll('root'); }); test("{ helper: 'original' }, fixed, with scroll offset on root and parent", function() { @@ -595,8 +595,8 @@ test("{ helper: 'original' }, fixed, with scroll offset on root and parent", fun setScroll('root'); testScroll('absolute'); - restoreScroll(); - restoreScroll('root'); + TestHelpers.restoreScroll(); + TestHelpers.restoreScroll('root'); }); @@ -639,7 +639,7 @@ test("{ helper: 'clone' }, absolute with scroll offset on parent", function() { drag(el, 1, 1); deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[' + dragged.dx + ', ' + dragged.dy + '] '); - restoreScroll(); + TestHelpers.restoreScroll(); }); @@ -668,7 +668,7 @@ test("{ helper: 'clone' }, absolute with scroll offset on root", function() { drag(el, 1, 1); deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[' + dragged.dx + ', ' + dragged.dy + '] '); - restoreScroll('root'); + TestHelpers.restoreScroll('root'); }); @@ -698,8 +698,8 @@ test("{ helper: 'clone' }, absolute with scroll offset on root and parent", func drag(el, 1, 1); deepEqual({ top: helperOffset.top-1, left: helperOffset.left-1 }, origOffset, 'dragged[' + dragged.dx + ', ' + dragged.dy + '] '); - restoreScroll('root'); - restoreScroll(); + TestHelpers.restoreScroll('root'); + TestHelpers.restoreScroll(); }); @@ -710,7 +710,7 @@ test("{ opacity: 0.5 }", function() { var opacity = null; el = $("#draggable2").draggable({ opacity: 0.5, - start: function(event, ui) { + start: function() { opacity = $(this).css("opacity"); } }); @@ -726,11 +726,11 @@ test("{ zIndex: 10 }", function() { expect(1); var actual, - expected = 10, - zIndex = null; + expected = 10; + el = $("#draggable2").draggable({ zIndex: expected, - start: function(event, ui) { + start: function() { actual = $(this).css("zIndex"); } }); diff --git a/tests/unit/droppable/droppable_core.js b/tests/unit/droppable/droppable_core.js index 3f709d25d..1ec50eecc 100644 --- a/tests/unit/droppable/droppable_core.js +++ b/tests/unit/droppable/droppable_core.js @@ -2,15 +2,15 @@ * droppable_core.js */ -var el, drg; +var el; -function shouldBeDroppable() { +TestHelpers.shouldBeDroppable = function() { ok(false, 'missing test - untested code is broken code'); -} +}; -function shouldNotBeDroppable() { +TestHelpers.shouldNotBeDroppable = function() { ok(false, 'missing test - untested code is broken code'); -} +}; (function($) { @@ -27,7 +27,7 @@ test("element types", function() { el = $(document.createElement(typeName)).appendTo('body'); (typeName === 'table' && el.append("content")); el.droppable(); - shouldBeDroppable(); + TestHelpers.shouldBeDroppable(); el.droppable("destroy"); el.remove(); }); diff --git a/tests/unit/droppable/droppable_events.js b/tests/unit/droppable/droppable_events.js index f22a03540..2e01b0c9c 100644 --- a/tests/unit/droppable/droppable_events.js +++ b/tests/unit/droppable/droppable_events.js @@ -5,6 +5,10 @@ module("droppable: events"); +// this is here to make JSHint pass "unused", and we don't want to +// remove the parameter for when we finally implement +$.noop(); + test("activate", function() { ok(false, 'missing test - untested code is broken code'); }); diff --git a/tests/unit/droppable/droppable_methods.js b/tests/unit/droppable/droppable_methods.js index 8fd49d265..51581b425 100644 --- a/tests/unit/droppable/droppable_methods.js +++ b/tests/unit/droppable/droppable_methods.js @@ -48,16 +48,16 @@ test("destroy", function() { test("enable", function() { expect(7); el = $("#droppable1").droppable({ disabled: true }); - shouldNotBeDroppable(); + TestHelpers.shouldNotBeDroppable(); el.droppable("enable"); - shouldBeDroppable(); + TestHelpers.shouldBeDroppable(); equal(el.droppable("option", "disabled"), false, "disabled option getter"); el.droppable("destroy"); el.droppable({ disabled: true }); - shouldNotBeDroppable(); + TestHelpers.shouldNotBeDroppable(); el.droppable("option", "disabled", false); equal(el.droppable("option", "disabled"), false, "disabled option setter"); - shouldBeDroppable(); + TestHelpers.shouldBeDroppable(); var expected = $('
').droppable(), actual = expected.droppable('enable'); @@ -67,16 +67,16 @@ test("enable", function() { test("disable", function() { expect(7); el = $("#droppable1").droppable({ disabled: false }); - shouldBeDroppable(); + TestHelpers.shouldBeDroppable(); el.droppable("disable"); - shouldNotBeDroppable(); + TestHelpers.shouldNotBeDroppable(); equal(el.droppable("option", "disabled"), true, "disabled option getter"); el.droppable("destroy"); el.droppable({ disabled: false }); - shouldBeDroppable(); + TestHelpers.shouldBeDroppable(); el.droppable("option", "disabled", true); equal(el.droppable("option", "disabled"), true, "disabled option setter"); - shouldNotBeDroppable(); + TestHelpers.shouldNotBeDroppable(); var expected = $('
').droppable(), actual = expected.droppable('disable'); diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js index c4e5c24f9..26390b7d3 100644 --- a/tests/unit/effects/effects_core.js +++ b/tests/unit/effects/effects_core.js @@ -12,10 +12,7 @@ function notPresent( value, array, message ) { var minDuration = 15, // duration is used for "long" animates where we plan on testing properties during animation - duration = 200, - - // mid is used for testing in the "middle" of the "duration" animations - mid = duration / 2; + duration = 200; module( "effects.core" ); @@ -58,8 +55,7 @@ test( "createWrapper and removeWrapper retain focused elements (#7595)", functio module( "effects.core: animateClass" ); asyncTest( "animateClass works with borderStyle", function() { - var test = $("div.animateClass"), - count = 0; + var test = $("div.animateClass"); expect(3); test.toggleClass("testAddBorder", minDuration, function() { test.toggleClass("testAddBorder", minDuration, function() { @@ -73,8 +69,8 @@ asyncTest( "animateClass works with borderStyle", function() { asyncTest( "animateClass works with colors", function() { var test = $("div.animateClass"), - count = 0, oldStep = jQuery.fx.step.backgroundColor; + expect(2); // we want to catch the first frame of animation @@ -102,7 +98,7 @@ asyncTest( "animateClass works with colors", function() { asyncTest( "animateClass calls step option", 1, function() { var test = jQuery( "div.animateClass" ), - step = function( fx ) { + step = function() { ok( true, "Step Function Called" ); test.stop(); start(); @@ -216,7 +212,7 @@ $.each( $.effects.effect, function( effect ) { equal( hidden.css("display"), "block", "Hidden is shown after .show(\"" +effect+ "\", time)" ); })).queue( queueTest() ).hide( effect, minDuration, queueTest(function() { equal( hidden.css("display"), "none", "Back to hidden after .hide(\"" +effect+ "\", time)" ); - })).queue( queueTest(function(next) { + })).queue( queueTest(function() { deepEqual( hidden.queue(), ["inprogress"], "Only the inprogress sentinel remains"); start(); })); diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js index d69fc46a3..a94968138 100644 --- a/tests/unit/menu/menu_events.js +++ b/tests/unit/menu/menu_events.js @@ -13,7 +13,7 @@ module( "menu: events", { test( "handle click on menu", function() { expect( 1 ); var element = $( "#menu1" ).menu({ - select: function( event, ui ) { + select: function() { log(); } }); @@ -29,7 +29,7 @@ test( "handle click on menu", function() { test( "handle click on custom item menu", function() { expect( 1 ); var element = $( "#menu5" ).menu({ - select: function( event, ui ) { + select: function() { log(); }, menus: "div" @@ -47,7 +47,7 @@ asyncTest( "handle blur", function() { expect( 1 ); var blurHandled = false, element = $( "#menu1" ).menu({ - blur: function( event, ui ) { + blur: function( event ) { // Ignore duplicate blur event fired by IE if ( !blurHandled ) { blurHandled = true; @@ -69,7 +69,7 @@ asyncTest( "handle blur via click outside", function() { expect( 1 ); var blurHandled = false, element = $( "#menu1" ).menu({ - blur: function( event, ui ) { + blur: function( event ) { // Ignore duplicate blur event fired by IE if ( !blurHandled ) { blurHandled = true; @@ -90,7 +90,7 @@ asyncTest( "handle blur via click outside", function() { test( "handle focus of menu with active item", function() { expect( 1 ); var element = $( "#menu1" ).menu({ - focus: function( event, ui ) { + focus: function( event ) { log( $( event.target ).find( ".ui-state-focus" ).parent().index() ); } }); @@ -168,7 +168,7 @@ test( "handle keyboard navigation on menu without scroll and without submenus", select: function( event, ui ) { log( $( ui.item[0] ).text() ); }, - focus: function( event, ui ) { + focus: function( event ) { log( $( event.target ).find( ".ui-state-focus" ).parent().index() ); } }); @@ -230,13 +230,13 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus" select: function( event, ui ) { log( $( ui.item[0] ).text() ); }, - focus: function( event, ui ) { + focus: function( event ) { log( $( event.target ).find( ".ui-state-focus" ).parent().index() ); } }); log( "keydown", true ); - element.one( "menufocus", function( event, ui ) { + element.one( "menufocus", function() { element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); equal( logOutput(), "keydown,1,2", "Keydown DOWN" ); @@ -350,7 +350,7 @@ test( "handle keyboard navigation on menu with scroll and without submenus", fun select: function( event, ui ) { log( $( ui.item[0] ).text() ); }, - focus: function( event, ui ) { + focus: function( event ) { log( $( event.target ).find( ".ui-state-focus" ).parent().index()); } }); @@ -421,13 +421,13 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f select: function( event, ui ) { log( $( ui.item[0] ).text() ); }, - focus: function( event, ui ) { + focus: function( event ) { log( $( event.target ).find( ".ui-state-focus" ).parent().index()); } }); log( "keydown", true ); - element.one( "menufocus", function( event, ui ) { + element.one( "menufocus", function() { element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); equal( logOutput(), "keydown,1,2", "Keydown DOWN" ); @@ -516,13 +516,13 @@ asyncTest( "handle keyboard navigation and mouse click on menu with disabled ite select: function( event, ui ) { log( $( ui.item[0] ).text() ); }, - focus: function( event, ui ) { + focus: function( event ) { log( $( event.target ).find( ".ui-state-focus" ).parent().index()); } }); log( "keydown", true ); - element.one( "menufocus", function( event, ui ) { + element.one( "menufocus", function() { element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } ); equal( logOutput(), "keydown,1", "Keydown focus but not select disabled item" ); @@ -564,13 +564,13 @@ asyncTest( "handle keyboard navigation and mouse click on menu with disabled ite test( "handle keyboard navigation with spelling of menu items", function() { expect( 2 ); var element = $( "#menu2" ).menu({ - focus: function( event, ui ) { + focus: function( event ) { log( $( event.target ).find( ".ui-state-focus" ).parent().index() ); } }); log( "keydown", true ); - element.one( "menufocus", function( event, ui ) { + element.one( "menufocus", function() { element.simulate( "keydown", { keyCode: 65 } ); element.simulate( "keydown", { keyCode: 68 } ); element.simulate( "keydown", { keyCode: 68 } ); diff --git a/tests/unit/menu/menu_methods.js b/tests/unit/menu/menu_methods.js index f9241f27b..c49783c3e 100644 --- a/tests/unit/menu/menu_methods.js +++ b/tests/unit/menu/menu_methods.js @@ -29,7 +29,7 @@ test( "destroy", function() { test( "enable/disable", function() { expect( 3 ); var element = $( "#menu1" ).menu({ - select: function( event, ui ) { + select: function() { log(); } }); diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js index a8b029201..2c8749e3c 100644 --- a/tests/unit/menu/menu_options.js +++ b/tests/unit/menu/menu_options.js @@ -14,7 +14,7 @@ test( "{ disabled: true }", function() { expect( 2 ); var element = $( "#menu1" ).menu({ disabled: true, - select: function(event, ui) { + select: function() { log(); } }); @@ -29,7 +29,7 @@ test( "{ disabled: false }", function() { expect( 2 ); var element = $( "#menu1" ).menu({ disabled: false, - select: function( event, ui ) { + select: function() { log(); } }); diff --git a/tests/unit/resizable/resizable_core.js b/tests/unit/resizable/resizable_core.js index aef2ae15c..8cc6cec82 100644 --- a/tests/unit/resizable/resizable_core.js +++ b/tests/unit/resizable/resizable_core.js @@ -2,9 +2,7 @@ * resizable_core.js */ -var el; - -var drag = function(el, dx, dy, complete) { +TestHelpers.resizableDrag = function(el, dx, dy, complete) { // speed = sync -> Drag syncrhonously. // speed = fast|slow -> Drag asyncrhonously - animated. @@ -46,10 +44,10 @@ test("n", function() { var handle = '.ui-resizable-n', target = $('#resizable1').resizable({ handles: 'all' }); - drag(handle, 0, -50); + TestHelpers.resizableDrag(handle, 0, -50); equal( target.height(), 150, "compare height" ); - drag(handle, 0, 50); + TestHelpers.resizableDrag(handle, 0, 50); equal( target.height(), 100, "compare height" ); }); @@ -58,10 +56,10 @@ test("s", function() { var handle = '.ui-resizable-s', target = $('#resizable1').resizable({ handles: 'all' }); - drag(handle, 0, 50); + TestHelpers.resizableDrag(handle, 0, 50); equal( target.height(), 150, "compare height" ); - drag(handle, 0, -50); + TestHelpers.resizableDrag(handle, 0, -50); equal( target.height(), 100, "compare height" ); }); @@ -70,10 +68,10 @@ test("e", function() { var handle = '.ui-resizable-e', target = $('#resizable1').resizable({ handles: 'all' }); - drag(handle, 50); + TestHelpers.resizableDrag(handle, 50); equal( target.width(), 150, "compare width"); - drag(handle, -50); + TestHelpers.resizableDrag(handle, -50); equal( target.width(), 100, "compare width" ); }); @@ -82,10 +80,10 @@ test("w", function() { var handle = '.ui-resizable-w', target = $('#resizable1').resizable({ handles: 'all' }); - drag(handle, -50); + TestHelpers.resizableDrag(handle, -50); equal( target.width(), 150, "compare width" ); - drag(handle, 50); + TestHelpers.resizableDrag(handle, 50); equal( target.width(), 100, "compare width" ); }); @@ -94,11 +92,11 @@ test("ne", function() { var handle = '.ui-resizable-ne', target = $('#resizable1').css({ overflow: 'hidden' }).resizable({ handles: 'all' }); - drag(handle, -50, -50); + TestHelpers.resizableDrag(handle, -50, -50); equal( target.width(), 50, "compare width" ); equal( target.height(), 150, "compare height" ); - drag(handle, 50, 50); + TestHelpers.resizableDrag(handle, 50, 50); equal( target.width(), 100, "compare width" ); equal( target.height(), 100, "compare height" ); }); @@ -108,11 +106,11 @@ test("se", function() { var handle = '.ui-resizable-se', target = $('#resizable1').resizable({ handles: 'all' }); - drag(handle, 50, 50); + TestHelpers.resizableDrag(handle, 50, 50); equal( target.width(), 150, "compare width" ); equal( target.height(), 150, "compare height" ); - drag(handle, -50, -50); + TestHelpers.resizableDrag(handle, -50, -50); equal( target.width(), 100, "compare width" ); equal( target.height(), 100, "compare height" ); }); @@ -122,11 +120,11 @@ test("sw", function() { var handle = '.ui-resizable-sw', target = $('#resizable1').resizable({ handles: 'all' }); - drag(handle, -50, -50); + TestHelpers.resizableDrag(handle, -50, -50); equal( target.width(), 150, "compare width" ); equal( target.height(), 50, "compare height" ); - drag(handle, 50, 50); + TestHelpers.resizableDrag(handle, 50, 50); equal( target.width(), 100, "compare width" ); equal( target.height(), 100, "compare height" ); }); @@ -136,11 +134,11 @@ test("nw", function() { var handle = '.ui-resizable-nw', target = $('#resizable1').resizable({ handles: 'all' }); - drag(handle, -50, -50); + TestHelpers.resizableDrag(handle, -50, -50); equal( target.width(), 150, "compare width" ); equal( target.height(), 150, "compare height" ); - drag(handle, 50, 50); + TestHelpers.resizableDrag(handle, 50, 50); equal( target.width(), 100, "compare width" ); equal( target.height(), 100, "compare height" ); }); diff --git a/tests/unit/resizable/resizable_events.js b/tests/unit/resizable/resizable_events.js index 52d55731c..d7793ff2f 100644 --- a/tests/unit/resizable/resizable_events.js +++ b/tests/unit/resizable/resizable_events.js @@ -5,4 +5,8 @@ module("resizable: events"); +// this is here to make JSHint pass "unused", and we don't want to +// remove the parameter for when we finally implement +$.noop(); + })(jQuery); diff --git a/tests/unit/resizable/resizable_methods.js b/tests/unit/resizable/resizable_methods.js index 87859acf7..b12f3035a 100644 --- a/tests/unit/resizable/resizable_methods.js +++ b/tests/unit/resizable/resizable_methods.js @@ -5,5 +5,8 @@ module("resizable: methods"); +// this is here to make JSHint pass "unused", and we don't want to +// remove the parameter for when we finally implement +$.noop(); })(jQuery); diff --git a/tests/unit/resizable/resizable_options.js b/tests/unit/resizable/resizable_options.js index e10a55a31..c17f329fd 100644 --- a/tests/unit/resizable/resizable_options.js +++ b/tests/unit/resizable/resizable_options.js @@ -10,11 +10,11 @@ test("aspectRatio: 'preserve' (e)", function() { var handle = '.ui-resizable-e', target = $('#resizable1').resizable({ aspectRatio: 'preserve', handles: 'all', minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - drag(handle, 80); + TestHelpers.resizableDrag(handle, 80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - drag(handle, -130); + TestHelpers.resizableDrag(handle, -130); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -24,11 +24,11 @@ test("aspectRatio: 'preserve' (w)", function() { var handle = '.ui-resizable-w', target = $('#resizable1').resizable({ aspectRatio: 'preserve', handles: 'all', minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - drag(handle, -80); + TestHelpers.resizableDrag(handle, -80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - drag(handle, 130); + TestHelpers.resizableDrag(handle, 130); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -38,11 +38,11 @@ test("aspectRatio: 'preserve' (n)", function() { var handle = '.ui-resizable-n', target = $('#resizable1').resizable({ aspectRatio: 'preserve', handles: 'all', minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - drag(handle, 0, -80); + TestHelpers.resizableDrag(handle, 0, -80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - drag(handle, 0, 80); + TestHelpers.resizableDrag(handle, 0, 80); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -52,11 +52,11 @@ test("aspectRatio: 'preserve' (s)", function() { var handle = '.ui-resizable-s', target = $('#resizable1').resizable({ aspectRatio: 'preserve', handles: 'all', minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - drag(handle, 0, 80); + TestHelpers.resizableDrag(handle, 0, 80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - drag(handle, 0, -80); + TestHelpers.resizableDrag(handle, 0, -80); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -66,11 +66,11 @@ test("aspectRatio: 'preserve' (se)", function() { var handle = '.ui-resizable-se', target = $('#resizable1').resizable({ aspectRatio: 'preserve', handles: 'all', minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - drag(handle, 80, 80); + TestHelpers.resizableDrag(handle, 80, 80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - drag(handle, -80, -80); + TestHelpers.resizableDrag(handle, -80, -80); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -80,11 +80,11 @@ test("aspectRatio: 'preserve' (sw)", function() { var handle = '.ui-resizable-sw', target = $('#resizable1').resizable({ aspectRatio: 'preserve', handles: 'all', minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - drag(handle, -80, 80); + TestHelpers.resizableDrag(handle, -80, 80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - drag(handle, 80, -80); + TestHelpers.resizableDrag(handle, 80, -80); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -94,11 +94,11 @@ test("aspectRatio: 'preserve' (ne)", function() { var handle = '.ui-resizable-ne', target = $('#resizable1').resizable({ aspectRatio: 'preserve', handles: 'all', minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - drag(handle, 80, -80); + TestHelpers.resizableDrag(handle, 80, -80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - drag(handle, -80, 80); + TestHelpers.resizableDrag(handle, -80, 80); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -108,11 +108,11 @@ test("grid", function() { var handle = '.ui-resizable-se', target = $('#resizable1').resizable({ handles: 'all', grid: [0, 20] }); - drag(handle, 3, 9); + TestHelpers.resizableDrag(handle, 3, 9); equal( target.width(), 103, "compare width"); equal( target.height(), 100, "compare height"); - drag(handle, 15, 11); + TestHelpers.resizableDrag(handle, 15, 11); equal( target.width(), 118, "compare width"); equal( target.height(), 120, "compare height"); }); @@ -122,11 +122,11 @@ test("grid (wrapped)", function() { var handle = '.ui-resizable-se', target = $('#resizable2').resizable({ handles: 'all', grid: [0, 20] }); - drag(handle, 3, 9); + TestHelpers.resizableDrag(handle, 3, 9); equal( target.width(), 103, "compare width"); equal( target.height(), 100, "compare height"); - drag(handle, 15, 11); + TestHelpers.resizableDrag(handle, 15, 11); equal( target.width(), 118, "compare width"); equal( target.height(), 120, "compare height"); }); @@ -136,11 +136,11 @@ test("ui-resizable-se { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1 var handle = '.ui-resizable-se', target = $('#resizable1').resizable({ handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }); - drag(handle, -50, -50); + TestHelpers.resizableDrag(handle, -50, -50); equal( target.width(), 60, "compare minWidth" ); equal( target.height(), 60, "compare minHeight" ); - drag(handle, 70, 70); + TestHelpers.resizableDrag(handle, 70, 70); equal( target.width(), 100, "compare maxWidth" ); equal( target.height(), 100, "compare maxHeight" ); }); @@ -150,11 +150,11 @@ test("ui-resizable-sw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1 var handle = '.ui-resizable-sw', target = $('#resizable1').resizable({ handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }); - drag(handle, 50, -50); + TestHelpers.resizableDrag(handle, 50, -50); equal( target.width(), 60, "compare minWidth" ); equal( target.height(), 60, "compare minHeight" ); - drag(handle, -70, 70); + TestHelpers.resizableDrag(handle, -70, 70); equal( target.width(), 100, "compare maxWidth" ); equal( target.height(), 100, "compare maxHeight" ); }); @@ -164,11 +164,11 @@ test("ui-resizable-ne { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1 var handle = '.ui-resizable-ne', target = $('#resizable1').resizable({ handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }); - drag(handle, -50, 50); + TestHelpers.resizableDrag(handle, -50, 50); equal( target.width(), 60, "compare minWidth" ); equal( target.height(), 60, "compare minHeight" ); - drag(handle, 70, -70); + TestHelpers.resizableDrag(handle, 70, -70); equal( target.width(), 100, "compare maxWidth" ); equal( target.height(), 100, "compare maxHeight" ); }); @@ -178,11 +178,11 @@ test("ui-resizable-nw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1 var handle = '.ui-resizable-nw', target = $('#resizable1').resizable({ handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }); - drag(handle, 70, 70); + TestHelpers.resizableDrag(handle, 70, 70); equal( target.width(), 60, "compare minWidth" ); equal( target.height(), 60, "compare minHeight" ); - drag(handle, -70, -70); + TestHelpers.resizableDrag(handle, -70, -70); equal( target.width(), 100, "compare maxWidth" ); equal( target.height(), 100, "compare maxHeight" ); }); diff --git a/tests/unit/selectable/selectable_core.js b/tests/unit/selectable/selectable_core.js index 18ea3a302..d2e885fc7 100644 --- a/tests/unit/selectable/selectable_core.js +++ b/tests/unit/selectable/selectable_core.js @@ -4,7 +4,7 @@ var el; -var drag = function(dx, dy) { +TestHelpers.selectableDrag = function drag(dx, dy) { var off = el.offset(), pos = { clientX: off.left, clientY: off.top }; el.simulate("mousedown", pos); $(document).simulate("mousemove", pos); diff --git a/tests/unit/selectable/selectable_events.js b/tests/unit/selectable/selectable_events.js index 2623818a7..bfd431bd8 100644 --- a/tests/unit/selectable/selectable_events.js +++ b/tests/unit/selectable/selectable_events.js @@ -9,7 +9,7 @@ test("start", function() { expect(2); el = $("#selectable1"); el.selectable({ - start: function(ev, ui) { + start: function() { ok(true, "drag fired start callback"); equal(this, el[0], "context of callback"); } @@ -21,7 +21,7 @@ test("stop", function() { expect(2); el = $("#selectable1"); el.selectable({ - start: function(ev, ui) { + start: function() { ok(true, "drag fired stop callback"); equal(this, el[0], "context of callback"); } diff --git a/tests/unit/selectable/selectable_methods.js b/tests/unit/selectable/selectable_methods.js index dbc88f269..ee7242d9b 100644 --- a/tests/unit/selectable/selectable_methods.js +++ b/tests/unit/selectable/selectable_methods.js @@ -21,7 +21,7 @@ test("init", function() { ok(true, 'arbitrary method called after init'); el = $("
").selectable(); - var foo = el.selectable("option", "foo"); + el.selectable("option", "foo"); el.remove(); ok(true, 'arbitrary option getter after init'); diff --git a/tests/unit/selectable/selectable_options.js b/tests/unit/selectable/selectable_options.js index be9fdf5fe..ad57000a9 100644 --- a/tests/unit/selectable/selectable_options.js +++ b/tests/unit/selectable/selectable_options.js @@ -13,7 +13,7 @@ test("autoRefresh", function() { actual = 0; el = $("#selectable1").selectable({ autoRefresh: false, selected: selected }); sel.hide(); - drag(1000, 1000); + TestHelpers.selectableDrag(1000, 1000); equal(actual, sel.length); el.selectable("destroy"); @@ -21,10 +21,10 @@ test("autoRefresh", function() { sel.show(); el = $("#selectable1").selectable({ autoRefresh: true, selected: selected }); sel.hide(); - drag(1000, 1000); + TestHelpers.selectableDrag(1000, 1000); equal(actual, 0); sel.show(); - drag(1000, 1000); + TestHelpers.selectableDrag(1000, 1000); equal(actual, sel.length); el.selectable("destroy"); sel.show(); @@ -37,7 +37,7 @@ test("filter", function() { actual = 0; el = $("#selectable1").selectable({ filter: '.special', selected: selected }); - drag(1000, 1000); + TestHelpers.selectableDrag(1000, 1000); ok(sel.length !== 1, "this test assumes more than 1 selectee"); equal(actual, 1); el.selectable("destroy"); diff --git a/tests/unit/slider/slider_events.js b/tests/unit/slider/slider_events.js index 4d0896442..2fb9b37b6 100644 --- a/tests/unit/slider/slider_events.js +++ b/tests/unit/slider/slider_events.js @@ -14,16 +14,16 @@ test( "mouse based interaction", function() { var el = $( "#slider1" ) .slider({ - start: function(event, ui) { + start: function( event ) { equal( event.originalEvent.type, "mousedown", "start triggered by mousedown" ); }, - slide: function(event, ui) { + slide: function( event) { equal( event.originalEvent.type, "mousemove", "slider triggered by mousemove" ); }, - stop: function(event, ui) { + stop: function( event ) { equal( event.originalEvent.type, "mouseup", "stop triggered by mouseup" ); }, - change: function(event, ui) { + change: function( event ) { equal( event.originalEvent.type, "mouseup", "change triggered by mouseup" ); } }); @@ -38,16 +38,16 @@ test( "keyboard based interaction", function() { // Test keyup at end of handle slide (keyboard) var el = $( "#slider1" ) .slider({ - start: function(event, ui) { + start: function( event ) { equal( event.originalEvent.type, "keydown", "start triggered by keydown" ); }, - slide: function(event, ui) { + slide: function() { ok( false, "Slider never triggered by keys" ); }, - stop: function(event, ui) { + stop: function( event ) { equal( event.originalEvent.type, "keyup", "stop triggered by keyup" ); }, - change: function(event, ui) { + change: function( event ) { equal( event.originalEvent.type, "keyup", "change triggered by keyup" ); } }); @@ -64,7 +64,7 @@ test( "programmatic event triggers", function() { // Test value method var el = $( "
" ) .slider({ - change: function(event, ui) { + change: function() { ok( true, "change triggered by value method" ); } }) @@ -75,7 +75,7 @@ test( "programmatic event triggers", function() { el = $( "
" ) .slider({ values: [ 10, 20 ], - change: function(event, ui) { + change: function() { ok( true, "change triggered by values method" ); } }) @@ -85,7 +85,7 @@ test( "programmatic event triggers", function() { // Test value option el = $( "
" ) .slider({ - change: function(event, ui) { + change: function() { ok( true, "change triggered by value option" ); } }) @@ -96,7 +96,7 @@ test( "programmatic event triggers", function() { el = $( "
" ) .slider({ values: [ 10, 20 ], - change: function(event, ui) { + change: function() { ok( true, "change triggered by values option" ); } }) diff --git a/tests/unit/slider/slider_methods.js b/tests/unit/slider/slider_methods.js index 1a6b493c9..11d679845 100644 --- a/tests/unit/slider/slider_methods.js +++ b/tests/unit/slider/slider_methods.js @@ -17,8 +17,8 @@ test("init", function() { $('
').slider().remove(); ok(true, '.slider() called on disconnected DOMElement'); - var el = $('
').slider(), - foo = el.slider("option", "foo"); + var el = $('
').slider(); + el.slider("option", "foo"); el.remove(); ok(true, 'arbitrary option getter after init'); diff --git a/tests/unit/sortable/sortable_core.js b/tests/unit/sortable/sortable_core.js index ff1859874..540e06f0f 100644 --- a/tests/unit/sortable/sortable_core.js +++ b/tests/unit/sortable/sortable_core.js @@ -6,4 +6,8 @@ module("sortable: core"); +// this is here to make JSHint pass "unused", and we don't want to +// remove the parameter for when we finally implement +$.noop(); + })(jQuery); diff --git a/tests/unit/sortable/sortable_options.js b/tests/unit/sortable/sortable_options.js index a043e68fe..d5d7b3de1 100644 --- a/tests/unit/sortable/sortable_options.js +++ b/tests/unit/sortable/sortable_options.js @@ -5,6 +5,10 @@ module("sortable: options"); +// this is here to make JSHint pass "unused", and we don't want to +// remove the parameter for when we finally implement +$.noop(); + test("{ appendTo: 'parent' }, default", function() { ok(false, "missing test - untested code is broken code."); }); diff --git a/tests/unit/sortable/sortable_tickets.js b/tests/unit/sortable/sortable_tickets.js index 22ad61baf..14bb705ea 100644 --- a/tests/unit/sortable/sortable_tickets.js +++ b/tests/unit/sortable/sortable_tickets.js @@ -44,13 +44,13 @@ test('#4752: link event firing on sortable with connect list', function () { $('#main ul').sortable({ connectWith: '#main ul', - change: function (e, ui) { + change: function () { fired.change = true; }, - receive: function (e, ui) { + receive: function () { fired.receive = true; }, - remove: function (e, ui) { + remove: function () { fired.remove = true; } }); diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/spinner_options.js index 1f6646a33..284e03a3e 100644 --- a/tests/unit/spinner/spinner_options.js +++ b/tests/unit/spinner/spinner_options.js @@ -1,7 +1,5 @@ (function( $ ) { -var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp; - module( "spinner: options" ); // culture is tested after numberFormat, since it depends on numberFormat @@ -28,7 +26,7 @@ test( "icons: custom ", function() { test( "incremental, false", function() { expect( 100 ); - var i, diff, + var i, prev = 0, element = $( "#spin" ).val( prev ).spinner({ incremental: false, @@ -53,7 +51,7 @@ test( "incremental, true", function() { }); } - var i, diff, + var i, prev = 0, expected = [].concat( fill( 18, 1 ), fill( 37, 2 ), fill( 14, 3 ), fill( 9, 4 ), fill( 6, 5 ), fill( 5, 6 ), fill ( 5, 7 ), diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js index 5dbe1d6b1..6307c4488 100644 --- a/tests/unit/tabs/tabs_core.js +++ b/tests/unit/tabs/tabs_core.js @@ -132,7 +132,6 @@ test( "accessibility", function() { asyncTest( "accessibility - ajax", function() { expect( 4 ); var element = $( "#tabs2" ).tabs(), - tab = element.find( ".ui-tabs-nav li" ).eq( 3 ), panel = $( "#custom-id" ); equal( panel.attr( "aria-live" ), "polite", "remote panel has aria-live" ); @@ -588,7 +587,7 @@ asyncTest( "keyboard support - CTRL+UP, ALT+PAGE_DOWN, ALT+PAGE_UP", function() test( "#3627 - Ajax tab with url containing a fragment identifier fails to load", function() { expect( 1 ); - var element = $( "#tabs2" ).tabs({ + $( "#tabs2" ).tabs({ active: 2, beforeLoad: function( event, ui ) { event.preventDefault(); @@ -603,7 +602,7 @@ test( "#4033 - IE expands hash to full url and misinterprets tab as ajax", funct var element = $( "" ); element.appendTo( "#main" ); element.tabs({ - beforeLoad: function( event, ui ) { + beforeLoad: function() { event.preventDefault(); ok( false, "should not be an ajax tab" ); } diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index 4a938c078..297a4546e 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -53,20 +53,20 @@ asyncTest( "cache", function() { var element = $( "#tabs2" ).tabs({ cache: true }); - element.one( "tabsshow", function( event, ui ) { + element.one( "tabsshow", function() { state( element, 0, 0, 1, 0, 0 ); }); - element.one( "tabsload", function( event, ui ) { + element.one( "tabsload", function() { ok( true, "tabsload" ); setTimeout(function() { element.tabs( "option", "active", 0 ); state( element, 1, 0, 0, 0, 0 ); - element.one( "tabsshow", function( event, ui ) { + element.one( "tabsshow", function() { state( element, 0, 0, 1, 0, 0 ); }); - element.one( "tabsload", function( event, ui ) { + element.one( "tabsload", function() { ok( false, "should be cached" ); }); element.tabs( "option", "active", 2 ); @@ -159,10 +159,10 @@ asyncTest( "spinner", function() { var element = $( "#tabs2" ).tabs(); - element.one( "tabsbeforeload", function( event, ui ) { + element.one( "tabsbeforeload", function() { equal( element.find( ".ui-tabs-nav li:eq(2) em" ).length, 1, "beforeload" ); }); - element.one( "tabsload", function( event, ui ) { + element.one( "tabsload", function() { // wait until after the load finishes before checking for the spinner to be removed setTimeout(function() { equal( element.find( ".ui-tabs-nav li:eq(2) em" ).length, 0, "load" ); @@ -351,7 +351,7 @@ test( "show", function() { state( element, 0, 1, 0 ); // collapsing - element.one( "tabsshow", function( event, ui ) { + element.one( "tabsshow", function() { ok( false, "collapsing" ); }); element.tabs( "option", "active", false ); @@ -391,7 +391,7 @@ test( "select", function() { state( element, 0, 1, 0 ); // collapsing - element.one( "tabsselect", function( event, ui ) { + element.one( "tabsselect", function() { ok( false, "collapsing" ); }); element.tabs( "option", "active", false ); diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js index 74a561c0d..c0ab490e1 100644 --- a/tests/unit/testsuite.js +++ b/tests/unit/testsuite.js @@ -116,7 +116,7 @@ function testWidgetDefaults( widget, defaults ) { // ensure that all defaults were tested test( "tested defaults", function() { var count = 0; - $.each( pluginDefaults, function( key, val ) { + $.each( pluginDefaults, function( key ) { expect( ++count ); ok( key in defaults, key ); }); @@ -227,7 +227,7 @@ window.domEqual = function( selector, modifier, message ) { delete result.data[ $.expando ]; children = elem.children(); if ( children.length ) { - result.children = elem.children().map(function( ind ) { + result.children = elem.children().map(function() { return extract( $( this ) ); }).get(); } else { diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js index e5046f464..3be651855 100644 --- a/tests/unit/tooltip/tooltip_options.js +++ b/tests/unit/tooltip/tooltip_options.js @@ -67,7 +67,7 @@ test( "content: change while open", function() { test( "content: string", function() { expect( 1 ); - var element = $( "#tooltipped1" ).tooltip({ + $( "#tooltipped1" ).tooltip({ content: "just a string", open: function( event, ui ) { equal( ui.tooltip.text(), "just a string" ); diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js index 5efd91268..848579a1d 100644 --- a/tests/unit/widget/widget_core.js +++ b/tests/unit/widget/widget_core.js @@ -313,7 +313,7 @@ test( "re-init", function() { _init: function() { actions.push( "init" ); }, - _setOption: function( key, value ) { + _setOption: function( key ) { actions.push( "option" + key ); } }); @@ -959,11 +959,11 @@ test( "._trigger() - cancelled event", function() { }); $( "#widget" ).testWidget({ - foo: function( event, ui ) { + foo: function() { ok( true, "callback invoked even if event is cancelled" ); } }) - .bind( "testwidgetfoo", function( event, ui ) { + .bind( "testwidgetfoo", function() { ok( true, "event was triggered" ); return false; }); @@ -978,7 +978,7 @@ test( "._trigger() - cancelled callback", function() { }); $( "#widget" ).testWidget({ - foo: function( event, ui ) { + foo: function() { return false; } }); diff --git a/ui/.jshintrc b/ui/.jshintrc index 26b808774..edf09721b 100644 --- a/ui/.jshintrc +++ b/ui/.jshintrc @@ -10,6 +10,7 @@ "onevar": true, "trailing": true, "undef": true, + "unused": true, "predef": [ "Globalize" ] diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index a23d5e66d..108647419 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -603,7 +603,7 @@ if ( $.uiBackCompat !== false ) { _create.call( this ); }, - _setOption: function( key, value ) { + _setOption: function( key ) { if ( key === "autoHeight" || key === "clearStyle" || key === "fillSpace" ) { this.options.heightStyle = this._mergeHeightStyle(); } diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js index aec12bf8f..7bacca006 100644 --- a/ui/jquery.ui.autocomplete.js +++ b/ui/jquery.ui.autocomplete.js @@ -359,7 +359,7 @@ $.widget( "ui.autocomplete", { url: url, data: request, dataType: "json", - success: function( data, status ) { + success: function( data ) { response( data ); }, error: function() { @@ -541,7 +541,7 @@ $.widget( "ui.autocomplete", { return this.menu.element; }, - _value: function( value ) { + _value: function() { return this.valueMethod.apply( this.element, arguments ); }, diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index e234464ad..f2e3f945f 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -88,6 +88,11 @@ $.widget("ui.dialog", { options = this.options, title = options.title || " ", + uiDialog, + uiDialogTitlebar, + uiDialogTitlebarClose, + uiDialogTitle, + uiDialogButtonPane; uiDialog = ( this.uiDialog = $( "
" ) ) .addClass( uiDialogClasses + options.dialogClass ) @@ -108,13 +113,13 @@ $.widget("ui.dialog", { .mousedown(function( event ) { that.moveToTop( false, event ); }) - .appendTo( "body" ), + .appendTo( "body" ); - uiDialogContent = this.element + this.element .show() .removeAttr( "title" ) .addClass( "ui-dialog-content ui-widget-content" ) - .appendTo( uiDialog ), + .appendTo( uiDialog ); uiDialogTitlebar = ( this.uiDialogTitlebar = $( "
" ) ) .addClass( "ui-dialog-titlebar ui-widget-header " + @@ -123,7 +128,7 @@ $.widget("ui.dialog", { // Dialog isn't getting focus when dragging (#8063) uiDialog.focus(); }) - .prependTo( uiDialog ), + .prependTo( uiDialog ); uiDialogTitlebarClose = $( "" ) .addClass( "ui-dialog-titlebar-close ui-corner-all" ) @@ -132,23 +137,23 @@ $.widget("ui.dialog", { event.preventDefault(); that.close( event ); }) - .appendTo( uiDialogTitlebar ), + .appendTo( uiDialogTitlebar ); - uiDialogTitlebarCloseText = ( this.uiDialogTitlebarCloseText = $( "" ) ) + ( this.uiDialogTitlebarCloseText = $( "" ) ) .addClass( "ui-icon ui-icon-closethick" ) .text( options.closeText ) - .appendTo( uiDialogTitlebarClose ), + .appendTo( uiDialogTitlebarClose ); uiDialogTitle = $( "" ) .uniqueId() .addClass( "ui-dialog-title" ) .html( title ) - .prependTo( uiDialogTitlebar ), + .prependTo( uiDialogTitlebar ); uiDialogButtonPane = ( this.uiDialogButtonPane = $( "
" ) ) - .addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" ), + .addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" ); - uiButtonSet = ( this.uiButtonSet = $( "
" ) ) + ( this.uiButtonSet = $( "
" ) ) .addClass( "ui-dialog-buttonset" ) .appendTo( uiDialogButtonPane ); @@ -350,8 +355,7 @@ $.widget("ui.dialog", { }, _createButtons: function( buttons ) { - var uiDialogButtonPane, uiButtonSet, - that = this, + var that = this, hasButtons = false; // if we already have a button pane, remove it diff --git a/ui/jquery.ui.effect.js b/ui/jquery.ui.effect.js index 8d875746e..37ca48795 100644 --- a/ui/jquery.ui.effect.js +++ b/ui/jquery.ui.effect.js @@ -245,8 +245,7 @@ color.fn = jQuery.extend( color.prototype, { var inst = this, type = jQuery.type( red ), - rgba = this._rgba = [], - source; + rgba = this._rgba = []; // more than 1 argument specified - assume ( red, green, blue, alpha ) if ( green !== undefined ) { @@ -427,7 +426,7 @@ color.fn = jQuery.extend( color.prototype, { rgba.push( ~~( alpha * 255 ) ); } - return "#" + jQuery.map( rgba, function( v, i ) { + return "#" + jQuery.map( rgba, function( v ) { // default to 0 when nulls exist v = ( v || 0 ).toString( 16 ); @@ -501,8 +500,7 @@ spaces.hsla.from = function ( hsla ) { l = hsla[ 2 ], a = hsla[ 3 ], q = l <= 0.5 ? l * ( 1 + s ) : l + s - l * s, - p = 2 * l - q, - r, g, b; + p = 2 * l - q; return [ Math.round( hue2rgb( p, q, h + ( 1 / 3 ) ) * 255 ), @@ -710,7 +708,6 @@ function getElementStyles() { this.currentStyle, newStyle = {}, key, - camelCase, len; // webkit enumerates style porperties @@ -1114,7 +1111,7 @@ function standardSpeed( speed ) { } $.fn.extend({ - effect: function( effect, options, speed, callback ) { + effect: function( /* effect, options, speed, callback */ ) { var args = _normalizeArguments.apply( this, arguments ), mode = args.mode, queue = args.queue, diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js index eb0f7fc15..18f7113d4 100644 --- a/ui/jquery.ui.slider.js +++ b/ui/jquery.ui.slider.js @@ -278,7 +278,7 @@ $.widget( "ui.slider", $.ui.mouse, { return true; }, - _mouseStart: function( event ) { + _mouseStart: function() { return true; }, @@ -591,7 +591,7 @@ $.widget( "ui.slider", $.ui.mouse, { _set = {}; if ( this.options.values && this.options.values.length ) { - this.handles.each(function( i, j ) { + this.handles.each(function( i ) { valPercent = ( that.values(i) - that._valueMin() ) / ( that._valueMax() - that._valueMin() ) * 100; _set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%"; $( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate ); diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 05456374d..0d920c3a1 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -45,8 +45,7 @@ $.widget( "ui.tabs", { }, _create: function() { - var panel, - that = this, + var that = this, options = this.options, active = options.active, locationHash = location.hash.substring( 1 ); @@ -295,8 +294,7 @@ $.widget( "ui.tabs", { }, refresh: function() { - var next, - options = this.options, + var options = this.options, lis = this.tablist.children( ":has(a[href])" ); // get disabled tabs from class attribute from HTML @@ -922,7 +920,7 @@ if ( $.uiBackCompat !== false ) { this._super(); }, - url: function( index, url ){ + url: function( index ){ this.anchors.eq( index ).removeData( "cache.tabs" ); this._superApply( arguments ); } @@ -1158,7 +1156,7 @@ if ( $.uiBackCompat !== false ) { } }, - _eventHandler: function( event ) { + _eventHandler: function() { this._superApply( arguments ); this.options.selected = this.options.active; if ( this.options.selected === false ) { @@ -1254,7 +1252,7 @@ if ( $.uiBackCompat !== false ) { this._cookie( this.options.active, this.options.cookie ); } }, - _eventHandler: function( event ) { + _eventHandler: function() { this._superApply( arguments ); if ( this.options.cookie ) { this._cookie( this.options.active, this.options.cookie ); diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js index 4a17f1f20..43788a082 100644 --- a/ui/jquery.ui.tooltip.js +++ b/ui/jquery.ui.tooltip.js @@ -284,7 +284,7 @@ $.widget( "ui.tooltip", { this.close( fakeEvent, true ); } }, - remove: function( event ) { + remove: function() { this._removeTooltip( tooltip ); } }; @@ -297,7 +297,7 @@ $.widget( "ui.tooltip", { this._on( target, events ); }, - close: function( event, force ) { + close: function( event ) { var that = this, target = $( event ? event.currentTarget : this.element ), tooltip = this._find( target ); diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js index 96cc6071c..59fd81b9e 100644 --- a/ui/jquery.ui.widget.js +++ b/ui/jquery.ui.widget.js @@ -200,7 +200,7 @@ $.widget.bridge = function( name, object ) { }; }; -$.Widget = function( options, element ) {}; +$.Widget = function( /* options, element */ ) {}; $.Widget._childConstructors = []; $.Widget.prototype = { -- cgit v1.2.3 From 52a184e31c0ca5618e6d4873625bf3b7716944b3 Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:27:33 -0400 Subject: Tabs: Removed ajaxOptions and cache options. Fixes #7147 - Tabs: Remove ajaxOptions and cache options. --- tests/unit/tabs/tabs_common_deprecated.js | 2 - tests/unit/tabs/tabs_deprecated.js | 53 ------------------------- ui/jquery.ui.tabs.js | 65 ------------------------------- 3 files changed, 120 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js index 5b41014da..040e8cbf2 100644 --- a/tests/unit/tabs/tabs_common_deprecated.js +++ b/tests/unit/tabs/tabs_common_deprecated.js @@ -1,8 +1,6 @@ TestHelpers.commonWidgetTests( "tabs", { defaults: { active: null, - ajaxOptions: null, - cache: false, collapsible: false, cookie: null, disabled: false, diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index 297a4546e..b3db097b9 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -24,59 +24,6 @@ test( "panel ids", function() { module( "tabs (deprecated): options" ); -asyncTest( "ajaxOptions", function() { - expect( 2 ); - - var element = $( "#tabs2" ).tabs({ - ajaxOptions: { - data: "foo=bar", - converters: { - "text html": function() { - return "test"; - } - } - } - }); - element.one( "tabsbeforeload", function( event, ui ) { - equal( ui.ajaxSettings.url.replace( /^[^\?]+/, "" ), "?foo=bar", "ajaxOptions.data" ); - }); - element.one( "tabsload", function( event, ui ) { - equal( $( ui.panel ).html(), "test" ); - start(); - }); - element.tabs( "option", "active", 2 ); -}); - -asyncTest( "cache", function() { - expect( 5 ); - - var element = $( "#tabs2" ).tabs({ - cache: true - }); - element.one( "tabsshow", function() { - state( element, 0, 0, 1, 0, 0 ); - }); - element.one( "tabsload", function() { - ok( true, "tabsload" ); - - setTimeout(function() { - element.tabs( "option", "active", 0 ); - state( element, 1, 0, 0, 0, 0 ); - - element.one( "tabsshow", function() { - state( element, 0, 0, 1, 0, 0 ); - }); - element.one( "tabsload", function() { - ok( false, "should be cached" ); - }); - element.tabs( "option", "active", 2 ); - start(); - }, 1 ); - }); - element.tabs( "option", "active", 2 ); - state( element, 0, 0, 1, 0, 0 ); -}); - test( "idPrefix", function() { expect( 1 ); diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 0d920c3a1..77dad0892 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -825,7 +825,6 @@ $.widget( "ui.tabs", { } }, - // TODO: Remove this function in 1.10 when ajaxOptions is removed _ajaxSettings: function( anchor, event, eventData ) { var that = this; return { @@ -862,70 +861,6 @@ if ( $.uiBackCompat !== false ) { } }); - // TODO: Remove _ajaxSettings() method when removing this extension - // ajaxOptions and cache options - $.widget( "ui.tabs", $.ui.tabs, { - options: { - ajaxOptions: null, - cache: false - }, - - _create: function() { - this._super(); - - var that = this; - - this._on({ tabsbeforeload: function( event, ui ) { - // tab is already cached - if ( $.data( ui.tab[ 0 ], "cache.tabs" ) ) { - event.preventDefault(); - return; - } - - ui.jqXHR.success(function() { - if ( that.options.cache ) { - $.data( ui.tab[ 0 ], "cache.tabs", true ); - } - }); - }}); - }, - - _ajaxSettings: function( anchor, event, ui ) { - var ajaxOptions = this.options.ajaxOptions; - return $.extend( {}, ajaxOptions, { - error: function( xhr, status ) { - try { - // Passing index avoid a race condition when this method is - // called after the user has selected another tab. - // Pass the anchor that initiated this request allows - // loadError to manipulate the tab content panel via $(a.hash) - ajaxOptions.error( - xhr, status, ui.tab.closest( "li" ).index(), ui.tab[ 0 ] ); - } - catch ( error ) {} - } - }, this._superApply( arguments ) ); - }, - - _setOption: function( key, value ) { - // reset cache if switching from cached to not cached - if ( key === "cache" && value === false ) { - this.anchors.removeData( "cache.tabs" ); - } - this._super( key, value ); - }, - - _destroy: function() { - this.anchors.removeData( "cache.tabs" ); - this._super(); - }, - - url: function( index ){ - this.anchors.eq( index ).removeData( "cache.tabs" ); - this._superApply( arguments ); - } - }); - // abort method $.widget( "ui.tabs", $.ui.tabs, { abort: function() { -- cgit v1.2.3 From acdd1917b2ab5a3b5469678d835107152ed5aaef Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:28:54 -0400 Subject: Tabs: Removed url method. Fixes #7148 - Tabs: Remove url method. --- tests/unit/tabs/tabs_deprecated.js | 15 --------------- ui/jquery.ui.tabs.js | 7 ------- 2 files changed, 22 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index b3db097b9..49ad5c13e 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -510,21 +510,6 @@ test( "length", function() { equal( $( "#tabs2" ).tabs().tabs( "length" ), 5, "ajax tabs with missing panels" ); }); -test( "url", function() { - expect( 2 ); - - var element = $( "#tabs2" ).tabs(), - anchor = element.find( ".ui-tabs-anchor" ).eq( 3 ); - - element.tabs( "url", 3, "data/test2.html" ); - equal( anchor.attr( "href" ), "data/test2.html", "href was updated" ); - element.one( "tabsbeforeload", function( event, ui ) { - equal( ui.ajaxSettings.url, "data/test2.html", "ajaxSettings.url" ); - event.preventDefault(); - }); - element.tabs( "option", "active", 3 ); -}); - asyncTest( "abort", function() { expect( 1 ); diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 77dad0892..bc911139e 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -854,13 +854,6 @@ if ( $.uiBackCompat !== false ) { }; }; - // url method - $.widget( "ui.tabs", $.ui.tabs, { - url: function( index, url ) { - this.anchors.eq( index ).attr( "href", url ); - } - }); - // abort method $.widget( "ui.tabs", $.ui.tabs, { abort: function() { -- cgit v1.2.3 From 723d3e0040c46079cedf3998f4e28edfceed7c74 Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:32:02 -0400 Subject: Tabs: Removed fx option. Fixes #8320 - Tabs: Remove fx option. --- tests/unit/tabs/tabs_common_deprecated.js | 1 - ui/jquery.ui.tabs.js | 70 ------------------------------- 2 files changed, 71 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js index 040e8cbf2..8caff1ac5 100644 --- a/tests/unit/tabs/tabs_common_deprecated.js +++ b/tests/unit/tabs/tabs_common_deprecated.js @@ -7,7 +7,6 @@ TestHelpers.commonWidgetTests( "tabs", { event: "click", heightStyle: "content", hide: null, - fx: null, idPrefix: "ui-tabs-", panelTemplate: "
", // show: null, // conflicts with old show callback diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index bc911139e..28786e5ce 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -1207,76 +1207,6 @@ if ( $.uiBackCompat !== false ) { return this._super( type, event, _data ); } }); - - // fx option - // The new animation options (show, hide) conflict with the old show callback. - // The old fx option wins over show/hide anyway (always favor back-compat). - // If a user wants to use the new animation API, they must give up the old API. - $.widget( "ui.tabs", $.ui.tabs, { - options: { - fx: null // e.g. { height: "toggle", opacity: "toggle", duration: 200 } - }, - - _getFx: function() { - var hide, show, - fx = this.options.fx; - - if ( fx ) { - if ( $.isArray( fx ) ) { - hide = fx[ 0 ]; - show = fx[ 1 ]; - } else { - hide = show = fx; - } - } - - return fx ? { show: show, hide: hide } : null; - }, - - _toggle: function( event, eventData ) { - var that = this, - toShow = eventData.newPanel, - toHide = eventData.oldPanel, - fx = this._getFx(); - - if ( !fx ) { - return this._super( event, eventData ); - } - - that.running = true; - - function complete() { - that.running = false; - that._trigger( "activate", event, eventData ); - } - - function show() { - eventData.newTab.closest( "li" ).addClass( "ui-tabs-active ui-state-active" ); - - if ( toShow.length && fx.show ) { - toShow - .animate( fx.show, fx.show.duration, function() { - complete(); - }); - } else { - toShow.show(); - complete(); - } - } - - // start out by hiding, then showing, then completing - if ( toHide.length && fx.hide ) { - toHide.animate( fx.hide, fx.hide.duration, function() { - eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" ); - show(); - }); - } else { - eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" ); - toHide.hide(); - show(); - } - } - }); } })( jQuery ); -- cgit v1.2.3 From 0429532ad10b0708e085c4830bb930d8457d62f4 Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:36:24 -0400 Subject: Tabs: Removed cookie option. Fixes #7162 - Tabs: Remove cookie option. --- external/jquery.cookie.js | 89 ------------------------------- tests/unit/tabs/tabs_common_deprecated.js | 1 - tests/unit/tabs/tabs_deprecated.html | 1 - tests/unit/tabs/tabs_deprecated.js | 35 ------------ ui/jquery.ui.tabs.js | 52 ------------------ 5 files changed, 178 deletions(-) delete mode 100644 external/jquery.cookie.js (limited to 'ui/jquery.ui.tabs.js') diff --git a/external/jquery.cookie.js b/external/jquery.cookie.js deleted file mode 100644 index 7b3e70125..000000000 --- a/external/jquery.cookie.js +++ /dev/null @@ -1,89 +0,0 @@ -/*jslint browser: true */ /*global jQuery: true */ - -/** - * jQuery Cookie plugin - * - * Copyright (c) 2010 Klaus Hartl (stilbuero.de) - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - */ - -// TODO JsDoc - -/** - * Create a cookie with the given key and value and other optional parameters. - * - * @example $.cookie('the_cookie', 'the_value'); - * @desc Set the value of a cookie. - * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true }); - * @desc Create a cookie with all available options. - * @example $.cookie('the_cookie', 'the_value'); - * @desc Create a session cookie. - * @example $.cookie('the_cookie', null); - * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain - * used when the cookie was set. - * - * @param String key The key of the cookie. - * @param String value The value of the cookie. - * @param Object options An object literal containing key/value pairs to provide optional cookie attributes. - * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object. - * If a negative value is specified (e.g. a date in the past), the cookie will be deleted. - * If set to null or omitted, the cookie will be a session cookie and will not be retained - * when the the browser exits. - * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie). - * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie). - * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will - * require a secure protocol (like HTTPS). - * @type undefined - * - * @name $.cookie - * @cat Plugins/Cookie - * @author Klaus Hartl/klaus.hartl@stilbuero.de - */ - -/** - * Get the value of a cookie with the given key. - * - * @example $.cookie('the_cookie'); - * @desc Get the value of a cookie. - * - * @param String key The key of the cookie. - * @return The value of the cookie. - * @type String - * - * @name $.cookie - * @cat Plugins/Cookie - * @author Klaus Hartl/klaus.hartl@stilbuero.de - */ -jQuery.cookie = function (key, value, options) { - - // key and value given, set cookie... - if (arguments.length > 1 && (value === null || typeof value !== "object")) { - options = jQuery.extend({}, options); - - if (value === null) { - options.expires = -1; - } - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setDate(t.getDate() + days); - } - - return (document.cookie = [ - encodeURIComponent(key), '=', - options.raw ? String(value) : encodeURIComponent(String(value)), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } - - // key and possibly options given, get cookie... - options = value || {}; - var result, decode = options.raw ? function (s) { return s; } : decodeURIComponent; - return (result = new RegExp('(?:^|; )' + encodeURIComponent(key) + '=([^;]*)').exec(document.cookie)) ? decode(result[1]) : null; -}; diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js index 8caff1ac5..72fecfbdd 100644 --- a/tests/unit/tabs/tabs_common_deprecated.js +++ b/tests/unit/tabs/tabs_common_deprecated.js @@ -2,7 +2,6 @@ TestHelpers.commonWidgetTests( "tabs", { defaults: { active: null, collapsible: false, - cookie: null, disabled: false, event: "click", heightStyle: "content", diff --git a/tests/unit/tabs/tabs_deprecated.html b/tests/unit/tabs/tabs_deprecated.html index 9d3ecef3a..3c476d0b4 100644 --- a/tests/unit/tabs/tabs_deprecated.html +++ b/tests/unit/tabs/tabs_deprecated.html @@ -5,7 +5,6 @@ jQuery UI Tabs Test Suite - diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index 49ad5c13e..b93417375 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -66,41 +66,6 @@ test( "tabTemplate + panelTemplate", function() { ok( element.find( "#new" ).hasClass( "customPanel" ), "panel custom class" ); }); -test( "cookie", function() { - expect( 6 ); - - var element = $( "#tabs1" ), - cookieName = "tabs_test", - cookieObj = { name: cookieName }; - $.cookie( cookieName, null ); - function cookie() { - return parseInt( $.cookie( cookieName ), 10 ); - } - - element.tabs({ cookie: cookieObj }); - equal( cookie(), 0, "initial cookie value" ); - - element.tabs( "destroy" ); - element.tabs({ active: 1, cookie: cookieObj }); - equal( cookie(), 1, "initial cookie value, from active property" ); - - element.tabs( "option", "active", 2 ); - equal( cookie(), 2, "cookie value updated after activating" ); - - element.tabs( "destroy" ); - $.cookie( cookieName, 1 ); - element.tabs({ cookie: cookieObj }); - equal( cookie(), 1, "initial cookie value, from existing cookie" ); - - element.tabs( "destroy" ); - element.tabs({ cookie: cookieObj, collapsible: true }); - element.tabs( "option", "active", false ); - equal( cookie(), -1, "cookie value for all tabs unselected" ); - - element.tabs( "destroy" ); - ok( $.cookie( cookieName ) === null, "erase cookie after destroy" ); -}); - asyncTest( "spinner", function() { expect( 2 ); diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 28786e5ce..76216bfc9 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -1144,58 +1144,6 @@ if ( $.uiBackCompat !== false ) { } }); - // cookie option - (function() { - - var listId = 0; - - $.widget( "ui.tabs", $.ui.tabs, { - options: { - cookie: null // e.g. { expires: 7, path: '/', domain: 'jquery.com', secure: true } - }, - _create: function() { - var options = this.options, - active; - if ( options.active == null && options.cookie ) { - active = parseInt( this._cookie(), 10 ); - if ( active === -1 ) { - active = false; - } - options.active = active; - } - this._super(); - }, - _cookie: function( active ) { - var cookie = [ this.cookie || - ( this.cookie = this.options.cookie.name || "ui-tabs-" + (++listId) ) ]; - if ( arguments.length ) { - cookie.push( active === false ? -1 : active ); - cookie.push( this.options.cookie ); - } - return $.cookie.apply( null, cookie ); - }, - _refresh: function() { - this._super(); - if ( this.options.cookie ) { - this._cookie( this.options.active, this.options.cookie ); - } - }, - _eventHandler: function() { - this._superApply( arguments ); - if ( this.options.cookie ) { - this._cookie( this.options.active, this.options.cookie ); - } - }, - _destroy: function() { - this._super(); - if ( this.options.cookie ) { - this._cookie( null, this.options.cookie ); - } - } - }); - - })(); - // load event $.widget( "ui.tabs", $.ui.tabs, { _trigger: function( type, event, data ) { -- cgit v1.2.3 From 1a7958a43096ced70043514055e8f62422d860fd Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:37:37 -0400 Subject: Tabs: Removed length method. Fixes #7161 - Tabs: Remove length method. --- tests/unit/tabs/tabs_deprecated.js | 7 ------- ui/jquery.ui.tabs.js | 7 ------- 2 files changed, 14 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index b93417375..2de612853 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -468,13 +468,6 @@ test( "select", function() { equal( element.tabs( "option", "selected" ), 1, "selected" ); }); -test( "length", function() { - expect( 2 ); - - equal( $( "#tabs1" ).tabs().tabs( "length" ), 3, "basic tabs" ); - equal( $( "#tabs2" ).tabs().tabs( "length" ), 5, "ajax tabs with missing panels" ); -}); - asyncTest( "abort", function() { expect( 1 ); diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 76216bfc9..5f6d87eee 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -1021,13 +1021,6 @@ if ( $.uiBackCompat !== false ) { } }); - // length method - $.widget( "ui.tabs", $.ui.tabs, { - length: function() { - return this.anchors.length; - } - }); - // panel ids (idPrefix option + title attribute) $.widget( "ui.tabs", $.ui.tabs, { options: { -- cgit v1.2.3 From 0fc682a8dadc894caefe27c5a0fccf1eca30780d Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:39:15 -0400 Subject: Tabs: Removed enable and disable events. Fixes #7160 - Tabs: Remove enable and disable events. --- tests/unit/tabs/tabs_common_deprecated.js | 2 -- tests/unit/tabs/tabs_deprecated.js | 32 ------------------------- ui/jquery.ui.tabs.js | 40 ------------------------------- 3 files changed, 74 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js index 72fecfbdd..2449a07d3 100644 --- a/tests/unit/tabs/tabs_common_deprecated.js +++ b/tests/unit/tabs/tabs_common_deprecated.js @@ -18,8 +18,6 @@ TestHelpers.commonWidgetTests( "tabs", { beforeActivate: null, beforeLoad: null, create: null, - disable: null, - enable: null, load: null, remove: null, select: null, diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index 2de612853..6e84accdf 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -198,38 +198,6 @@ asyncTest( "load", function() { } }); -test( "enable", function() { - expect( 3 ); - - var element = $( "#tabs1" ).tabs({ - disabled: [ 0, 1 ], - enable: function( event, ui ) { - equal( ui.tab, element.find( ".ui-tabs-nav .ui-tabs-anchor" )[ 1 ], "ui.tab" ); - equal( ui.panel, element.find( ".ui-tabs-panel" )[ 1 ], "ui.panel" ); - equal( ui.index, 1, "ui.index" ); - } - }); - element.tabs( "enable", 1 ); - // shouldn't trigger event - element.tabs( "enable", 2 ); -}); - -test( "disable", function() { - expect( 3 ); - - var element = $( "#tabs1" ).tabs({ - disable: function( event, ui ) { - equal( ui.tab, element.find( ".ui-tabs-nav .ui-tabs-anchor" )[ 1 ], "ui.tab" ); - equal( ui.panel, element.find( ".ui-tabs-panel" )[ 1 ], "ui.panel" ); - equal( ui.index, 1, "ui.index" ); - } - }); - element.tabs( "disable", 1 ); - // shouldn't trigger event - element.tabs( "disable", 1 ); -}); - - test( "show", function() { expect( 13 ); diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 5f6d87eee..ed0ca1036 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -889,46 +889,6 @@ if ( $.uiBackCompat !== false ) { } }); - // enable/disable events - $.widget( "ui.tabs", $.ui.tabs, { - options: { - enable: null, - disable: null - }, - - enable: function( index ) { - var options = this.options, - trigger; - - if ( index && options.disabled === true || - ( $.isArray( options.disabled ) && $.inArray( index, options.disabled ) !== -1 ) ) { - trigger = true; - } - - this._superApply( arguments ); - - if ( trigger ) { - this._trigger( "enable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) ); - } - }, - - disable: function( index ) { - var options = this.options, - trigger; - - if ( index && options.disabled === false || - ( $.isArray( options.disabled ) && $.inArray( index, options.disabled ) === -1 ) ) { - trigger = true; - } - - this._superApply( arguments ); - - if ( trigger ) { - this._trigger( "disable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) ); - } - } - }); - // add/remove methods and events $.widget( "ui.tabs", $.ui.tabs, { options: { -- cgit v1.2.3 From 7cf2719d0c406c7ff17c7e784c0e1e6eb23b562a Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:41:14 -0400 Subject: Tabs: Removed select method. Fixes #7156 - Tabs: Remove select method. --- tests/unit/tabs/tabs_deprecated.js | 45 -------------------------------------- ui/jquery.ui.tabs.js | 15 ------------- 2 files changed, 60 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index 6e84accdf..b551b3279 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -391,51 +391,6 @@ test( "remove", function() { equal( element.tabs( "option", "active" ), false ); }); -test( "select", function() { - expect( 23 ); - - var element = $( "#tabs1" ).tabs(); - state( element, 1, 0, 0 ); - element.tabs( "select", 1 ); - state( element, 0, 1, 0 ); - equal( element.tabs( "option", "active" ), 1, "active" ); - equal( element.tabs( "option", "selected" ), 1, "selected" ); - element.tabs( "destroy" ); - - element.tabs({ collapsible: true }); - state( element, 1, 0, 0 ); - element.tabs( "select", 0 ); - state( element, 0, 0, 0 ); - equal( element.tabs( "option", "active" ), false, "active" ); - equal( element.tabs( "option", "selected" ), -1, "selected" ); - element.tabs( "destroy" ); - - element.tabs({ collapsible: true }); - element.tabs( "select", -1 ); - state( element, 0, 0, 0 ); - equal( element.tabs( "option", "active" ), false, "active" ); - equal( element.tabs( "option", "selected" ), -1, "selected" ); - element.tabs( "destroy" ); - - element.tabs(); - state( element, 1, 0, 0 ); - equal( element.tabs( "option", "active" ), 0, "active" ); - equal( element.tabs( "option", "selected" ), 0, "selected" ); - element.tabs( "select", 0 ); - state( element, 1, 0, 0 ); - equal( element.tabs( "option", "active" ), 0, "active" ); - equal( element.tabs( "option", "selected" ), 0, "selected" ); - element.tabs( "select", -1 ); - state( element, 1, 0, 0 ); - equal( element.tabs( "option", "active" ), 0, "active" ); - equal( element.tabs( "option", "selected" ), 0, "selected" ); - - element.tabs( "select", "#fragment-2" ); - state( element, 0, 1, 0 ); - equal( element.tabs( "option", "active" ), 1, "active" ); - equal( element.tabs( "option", "selected" ), 1, "selected" ); -}); - asyncTest( "abort", function() { expect( 1 ); diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index ed0ca1036..10cdaecd4 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -1082,21 +1082,6 @@ if ( $.uiBackCompat !== false ) { } }); - // select method - $.widget( "ui.tabs", $.ui.tabs, { - select: function( index ) { - index = this._getIndex( index ); - if ( index === -1 ) { - if ( this.options.collapsible && this.options.selected !== -1 ) { - index = this.options.selected; - } else { - return; - } - } - this.anchors.eq( index ).trigger( this.options.event + this.eventNamespace ); - } - }); - // load event $.widget( "ui.tabs", $.ui.tabs, { _trigger: function( type, event, data ) { -- cgit v1.2.3 From a1fd49fb2944a7dbe76e81ba648c2b56e7c6651d Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:44:22 -0400 Subject: Tabs: Removed show event. Fixes #7155 - Tabs: Remove show event. --- tests/unit/tabs/tabs_common_deprecated.js | 5 ++-- tests/unit/tabs/tabs_deprecated.js | 40 ------------------------------- ui/jquery.ui.tabs.js | 17 +------------ 3 files changed, 3 insertions(+), 59 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js index 2449a07d3..763e0d84e 100644 --- a/tests/unit/tabs/tabs_common_deprecated.js +++ b/tests/unit/tabs/tabs_common_deprecated.js @@ -8,7 +8,7 @@ TestHelpers.commonWidgetTests( "tabs", { hide: null, idPrefix: "ui-tabs-", panelTemplate: "
", - // show: null, // conflicts with old show callback + show: null, spinner: "Loading…", tabTemplate: "
  • #{label}
    • ", @@ -20,7 +20,6 @@ TestHelpers.commonWidgetTests( "tabs", { create: null, load: null, remove: null, - select: null, - show: null + select: null } }); diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index b551b3279..5f91f1b52 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -198,46 +198,6 @@ asyncTest( "load", function() { } }); -test( "show", function() { - expect( 13 ); - - var element = $( "#tabs1" ).tabs({ - active: false, - collapsible: true - }), - anchors = element.find( ".ui-tabs-nav .ui-tabs-anchor" ), - panels = element.find( ".ui-tabs-panel" ); - - // from collapsed - element.one( "tabsshow", function( event, ui ) { - ok( !( "originalEvent" in event ), "originalEvent" ); - strictEqual( ui.tab, anchors[ 0 ], "ui.tab" ); - strictEqual( ui.panel, panels[ 0 ], "ui.panel" ); - equal( ui.index, 0, "ui.index" ); - state( element, 1, 0, 0 ); - }); - element.tabs( "option", "active", 0 ); - state( element, 1, 0, 0 ); - - // switching tabs - element.one( "tabsshow", function( event, ui ) { - equal( event.originalEvent.type, "click", "originalEvent" ); - strictEqual( ui.tab, anchors[ 1 ], "ui.tab" ); - strictEqual( ui.panel, panels[ 1 ], "ui.panel" ); - equal( ui.index, 1, "ui.index" ); - state( element, 0, 1, 0 ); - }); - anchors.eq( 1 ).click(); - state( element, 0, 1, 0 ); - - // collapsing - element.one( "tabsshow", function() { - ok( false, "collapsing" ); - }); - element.tabs( "option", "active", false ); - state( element, 0, 0, 0 ); -}); - test( "select", function() { expect( 13 ); diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 10cdaecd4..4a8287305 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -1046,20 +1046,11 @@ if ( $.uiBackCompat !== false ) { } }); - // show and select event + // select event $.widget( "ui.tabs", $.ui.tabs, { options: { - show: null, select: null }, - _create: function() { - this._super(); - if ( this.options.active !== false ) { - this._trigger( "show", null, this._ui( - this.active.find( ".ui-tabs-anchor" )[ 0 ], - this._getPanelForTab( this.active )[ 0 ] ) ); - } - }, _trigger: function( type, event, data ) { var ret = this._superApply( arguments ); if ( !ret ) { @@ -1071,12 +1062,6 @@ if ( $.uiBackCompat !== false ) { panel: data.newPanel[ 0 ], index: data.newTab.closest( "li" ).index() }); - } else if ( type === "activate" && data.newTab.length ) { - ret = this._super( "show", event, { - tab: data.newTab.find( ".ui-tabs-anchor" )[ 0 ], - panel: data.newPanel[ 0 ], - index: data.newTab.closest( "li" ).index() - }); } return ret; } -- cgit v1.2.3 From fb525e1cb10ce5959df28b0cbd29ebdc96c266f4 Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:45:18 -0400 Subject: Tabs: Removed select event. Fixes #7154 - Tabs: Remove select event. --- tests/unit/tabs/tabs_common_deprecated.js | 3 +-- tests/unit/tabs/tabs_deprecated.js | 40 ------------------------------- ui/jquery.ui.tabs.js | 21 ---------------- 3 files changed, 1 insertion(+), 63 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js index 763e0d84e..0d381f9e9 100644 --- a/tests/unit/tabs/tabs_common_deprecated.js +++ b/tests/unit/tabs/tabs_common_deprecated.js @@ -19,7 +19,6 @@ TestHelpers.commonWidgetTests( "tabs", { beforeLoad: null, create: null, load: null, - remove: null, - select: null + remove: null } }); diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index 5f91f1b52..10c86d254 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -198,46 +198,6 @@ asyncTest( "load", function() { } }); -test( "select", function() { - expect( 13 ); - - var element = $( "#tabs1" ).tabs({ - active: false, - collapsible: true - }), - anchors = element.find( ".ui-tabs-nav .ui-tabs-anchor" ), - panels = element.find( ".ui-tabs-panel" ); - - // from collapsed - element.one( "tabsselect", function( event, ui ) { - ok( !( "originalEvent" in event ), "originalEvent" ); - strictEqual( ui.tab, anchors[ 0 ], "ui.tab" ); - strictEqual( ui.panel, panels[ 0 ], "ui.panel" ); - equal( ui.index, 0, "ui.index" ); - state( element, 0, 0, 0 ); - }); - element.tabs( "option", "active", 0 ); - state( element, 1, 0, 0 ); - - // switching tabs - element.one( "tabsselect", function( event, ui ) { - equal( event.originalEvent.type, "click", "originalEvent" ); - strictEqual( ui.tab, anchors[ 1 ], "ui.tab" ); - strictEqual( ui.panel, panels[ 1 ], "ui.panel" ); - equal( ui.index, 1, "ui.index" ); - state( element, 1, 0, 0 ); - }); - anchors.eq( 1 ).click(); - state( element, 0, 1, 0 ); - - // collapsing - element.one( "tabsselect", function() { - ok( false, "collapsing" ); - }); - element.tabs( "option", "active", false ); - state( element, 0, 0, 0 ); -}); - module( "tabs (deprecated): methods" ); test( "add", function() { diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 4a8287305..cc9e93b7d 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -1046,27 +1046,6 @@ if ( $.uiBackCompat !== false ) { } }); - // select event - $.widget( "ui.tabs", $.ui.tabs, { - options: { - select: null - }, - _trigger: function( type, event, data ) { - var ret = this._superApply( arguments ); - if ( !ret ) { - return false; - } - if ( type === "beforeActivate" && data.newTab.length ) { - ret = this._super( "select", event, { - tab: data.newTab.find( ".ui-tabs-anchor" )[ 0], - panel: data.newPanel[ 0 ], - index: data.newTab.closest( "li" ).index() - }); - } - return ret; - } - }); - // load event $.widget( "ui.tabs", $.ui.tabs, { _trigger: function( type, event, data ) { -- cgit v1.2.3 From a9053d93008e203391206cb743e873064fc8198b Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:46:54 -0400 Subject: Tabs: Removed selected option. Fixes #7152 - Tabs: Remove selected option. --- tests/unit/tabs/tabs_deprecated.js | 53 -------------------------------------- ui/jquery.ui.tabs.js | 36 -------------------------- 2 files changed, 89 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index 10c86d254..9f0e320cc 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -84,59 +84,6 @@ asyncTest( "spinner", function() { element.tabs( "option", "active", 2 ); }); -test( "selected", function() { - expect( 19 ); - - var element = $( "#tabs1" ).tabs(); - equal( element.tabs( "option", "selected" ), 0, "should be 0 by default" ); - state( element, 1, 0, 0 ); - element.tabs( "destroy" ); - - location.hash = "#fragment-3"; - element = $( "#tabs1" ).tabs(); - equal( element.tabs( "option", "selected" ), 2, "should be 2 based on URL" ); - state( element, 0, 0, 1 ); - element.tabs( "destroy" ); - - el = $('#tabs1').tabs({ - selected: -1, - collapsible: true - }); - state( element, 0, 0, 0 ); - equal( element.find( ".ui-tabs-nav .ui-state-active" ).length, 0, "no tabs selected" ); - strictEqual( element.tabs( "option", "selected" ), -1 ); - - element.tabs( "option", "collapsible", false ); - state( element, 1, 0, 0 ); - equal( element.tabs( "option", "selected" ), 0 ); - element.tabs( "destroy" ); - - element.tabs({ - selected: -1 - }); - state( element, 1, 0, 0 ); - strictEqual( element.tabs( "option", "selected" ), 0 ); - element.tabs( "destroy" ); - - element.tabs({ selected: 2 }); - equal( element.tabs( "option", "selected" ), 2 ); - state( element, 0, 0, 1 ); - - element.tabs( "option", "selected", 0 ); - equal( element.tabs( "option", "selected" ), 0 ); - state( element, 1, 0, 0 ); - - element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 1 ).click(); - equal( element.tabs( "option", "selected" ), 1 ); - state( element, 0, 1, 0 ); - - element.tabs( "option", "selected", 10 ); - equal( element.tabs( "option", "selected" ), 1 ); - state( element, 0, 1, 0 ); - - location.hash = "#"; -}); - module( "tabs (deprecated): events" ); asyncTest( "load", function() { diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index cc9e93b7d..09946072e 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -1010,42 +1010,6 @@ if ( $.uiBackCompat !== false ) { } }); - // selected option - $.widget( "ui.tabs", $.ui.tabs, { - _create: function() { - var options = this.options; - if ( options.active === null && options.selected !== undefined ) { - options.active = options.selected === -1 ? false : options.selected; - } - this._super(); - options.selected = options.active; - if ( options.selected === false ) { - options.selected = -1; - } - }, - - _setOption: function( key, value ) { - if ( key !== "selected" ) { - return this._super( key, value ); - } - - var options = this.options; - this._super( "active", value === -1 ? false : value ); - options.selected = options.active; - if ( options.selected === false ) { - options.selected = -1; - } - }, - - _eventHandler: function() { - this._superApply( arguments ); - this.options.selected = this.options.active; - if ( this.options.selected === false ) { - this.options.selected = -1; - } - } - }); - // load event $.widget( "ui.tabs", $.ui.tabs, { _trigger: function( type, event, data ) { -- cgit v1.2.3 From 6a00d418bc8346df7124708125056ad4717ce89c Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:47:51 -0400 Subject: Tabs: Removed spinner option. Fixes #7151 - Tabs: Remove spinner option. --- tests/unit/tabs/tabs_common_deprecated.js | 1 - tests/unit/tabs/tabs_deprecated.js | 18 ------------------ ui/jquery.ui.tabs.js | 26 -------------------------- 3 files changed, 45 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js index 0d381f9e9..a21489cda 100644 --- a/tests/unit/tabs/tabs_common_deprecated.js +++ b/tests/unit/tabs/tabs_common_deprecated.js @@ -9,7 +9,6 @@ TestHelpers.commonWidgetTests( "tabs", { idPrefix: "ui-tabs-", panelTemplate: "
    ", show: null, - spinner: "Loading…", tabTemplate: "
  • #{label}
    • ", // callbacks diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index 9f0e320cc..4d6d682f5 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -66,24 +66,6 @@ test( "tabTemplate + panelTemplate", function() { ok( element.find( "#new" ).hasClass( "customPanel" ), "panel custom class" ); }); -asyncTest( "spinner", function() { - expect( 2 ); - - var element = $( "#tabs2" ).tabs(); - - element.one( "tabsbeforeload", function() { - equal( element.find( ".ui-tabs-nav li:eq(2) em" ).length, 1, "beforeload" ); - }); - element.one( "tabsload", function() { - // wait until after the load finishes before checking for the spinner to be removed - setTimeout(function() { - equal( element.find( ".ui-tabs-nav li:eq(2) em" ).length, 0, "load" ); - start(); - }, 1 ); - }); - element.tabs( "option", "active", 2 ); -}); - module( "tabs (deprecated): events" ); asyncTest( "load", function() { diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 09946072e..45ac8e81c 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -863,32 +863,6 @@ if ( $.uiBackCompat !== false ) { } }); - // spinner - $.widget( "ui.tabs", $.ui.tabs, { - options: { - spinner: "Loading…" - }, - _create: function() { - this._super(); - this._on({ - tabsbeforeload: function( event, ui ) { - // Don't react to nested tabs or tabs that don't use a spinner - if ( event.target !== this.element[ 0 ] || - !this.options.spinner ) { - return; - } - - var span = ui.tab.find( "span" ), - html = span.html(); - span.html( this.options.spinner ); - ui.jqXHR.complete(function() { - span.html( html ); - }); - } - }); - } - }); - // add/remove methods and events $.widget( "ui.tabs", $.ui.tabs, { options: { -- cgit v1.2.3 From 828b3c420cb42f02544b46bfa9208499a4947651 Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:48:51 -0400 Subject: Tabs: Removed abort method. Fixes #7150 - Tabs: Remove abort method. --- tests/unit/tabs/tabs_deprecated.js | 18 ------------------ ui/jquery.ui.tabs.js | 9 --------- 2 files changed, 27 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index 4d6d682f5..bc2caab29 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -240,22 +240,4 @@ test( "remove", function() { equal( element.tabs( "option", "active" ), false ); }); -asyncTest( "abort", function() { - expect( 1 ); - - var element = $( "#tabs2" ).tabs(); - element.one( "tabsbeforeload", function( event, ui ) { - ui.jqXHR.error(function( jqXHR, status ) { - equal( status, "abort", "aborted" ); - start(); - }); - }); - // prevent IE from caching the request, so that it won't resolve before we call abort - element.find( ".ui-tabs-nav li:eq(2) .ui-tabs-anchor" ).attr( "href", function( href ) { - return href + "?" + (+ new Date()); - }); - element.tabs( "option", "active", 2 ); - element.tabs( "abort" ); -}); - }( jQuery ) ); diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 45ac8e81c..8d6e3bfa7 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -854,15 +854,6 @@ if ( $.uiBackCompat !== false ) { }; }; - // abort method - $.widget( "ui.tabs", $.ui.tabs, { - abort: function() { - if ( this.xhr ) { - this.xhr.abort(); - } - } - }); - // add/remove methods and events $.widget( "ui.tabs", $.ui.tabs, { options: { -- cgit v1.2.3 From 3d6c2a66d44a9283ad18e8c7c5ea701ddca82e59 Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 05:59:20 -0400 Subject: Tabs: Removed back-compat for load event. Fixes #8731 - Tabs: Remove back-compat for load event. --- tests/unit/tabs/tabs_deprecated.js | 61 ------------------------ tests/unit/tabs/tabs_events.js | 96 +++++++++++++++++++------------------- tests/unit/tabs/tabs_methods.js | 12 +---- ui/jquery.ui.tabs.js | 12 ----- 4 files changed, 49 insertions(+), 132 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index bc2caab29..9d3599494 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -66,67 +66,6 @@ test( "tabTemplate + panelTemplate", function() { ok( element.find( "#new" ).hasClass( "customPanel" ), "panel custom class" ); }); -module( "tabs (deprecated): events" ); - -asyncTest( "load", function() { - expect( 15 ); - - var tab, anchor, panelId, panel, - element = $( "#tabs2" ); - - // init - element.one( "tabsload", function( event, ui ) { - tab = element.find( ".ui-tabs-nav li" ).eq( 2 ); - anchor = tab.find( ".ui-tabs-anchor" ); - panelId = tab.attr( "aria-controls" ); - panel = $( "#" + panelId ); - - ok( !( "originalEvent" in event ), "originalEvent" ); - strictEqual( ui.tab, anchor[ 0 ], "tab" ); - strictEqual( ui.panel, panel[ 0 ], "panel" ); - equal( $( ui.panel ).find( "p" ).length, 1, "panel html" ); - state( element, 0, 0, 1, 0, 0 ); - tabsload1(); - }); - element.tabs({ active: 2 }); - - function tabsload1() { - // .option() - element.one( "tabsload", function( event, ui ) { - tab = element.find( ".ui-tabs-nav li" ).eq( 3 ); - anchor = tab.find( ".ui-tabs-anchor" ); - panelId = tab.attr( "aria-controls" ); - panel = $( "#" + panelId ); - - ok( !( "originalEvent" in event ), "originalEvent" ); - strictEqual( ui.tab, anchor[ 0 ], "tab" ); - strictEqual( ui.panel, panel[ 0 ], "panel" ); - equal( $( ui.panel ).find( "p" ).length, 1, "panel html" ); - state( element, 0, 0, 0, 1, 0 ); - tabsload2(); - }); - element.tabs( "option", "active", 3 ); - } - - function tabsload2() { - // click, change panel content - element.one( "tabsload", function( event, ui ) { - tab = element.find( ".ui-tabs-nav li" ).eq( 4 ); - anchor = tab.find( ".ui-tabs-anchor" ); - panelId = tab.attr( "aria-controls" ); - panel = $( "#" + panelId ); - - equal( event.originalEvent.type, "click", "originalEvent" ); - strictEqual( ui.tab, anchor[ 0 ], "tab" ); - strictEqual( ui.panel, panel[ 0 ], "panel" ); - equal( $( ui.panel ).find( "p" ).length, 1, "panel html" ); - state( element, 0, 0, 0, 0, 1 ); - start(); - }); - element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 4 ).click(); - } -}); - module( "tabs (deprecated): methods" ); test( "add", function() { diff --git a/tests/unit/tabs/tabs_events.js b/tests/unit/tabs/tabs_events.js index 57011bdad..f9b1755f7 100644 --- a/tests/unit/tabs/tabs_events.js +++ b/tests/unit/tabs/tabs_events.js @@ -253,16 +253,33 @@ test( "beforeLoad", function() { equal( panel.html().toLowerCase(), "

    testing

    ", "panel html after" ); }); -if ( $.uiBackCompat === false ) { - asyncTest( "load", function() { - expect( 21 ); +asyncTest( "load", function() { + expect( 21 ); - var tab, panelId, panel, - element = $( "#tabs2" ); + var tab, panelId, panel, + element = $( "#tabs2" ); + + // init + element.one( "tabsload", function( event, ui ) { + tab = element.find( ".ui-tabs-nav li" ).eq( 2 ); + panelId = tab.attr( "aria-controls" ); + panel = $( "#" + panelId ); + + ok( !( "originalEvent" in event ), "originalEvent" ); + equal( ui.tab.length, 1, "tab length" ); + strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" ); + equal( ui.panel.length, 1, "panel length" ); + strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" ); + equal( ui.panel.find( "p" ).length, 1, "panel html" ); + state( element, 0, 0, 1, 0, 0 ); + tabsload1(); + }); + element.tabs({ active: 2 }); - // init + function tabsload1() { + // .option() element.one( "tabsload", function( event, ui ) { - tab = element.find( ".ui-tabs-nav li" ).eq( 2 ); + tab = element.find( ".ui-tabs-nav li" ).eq( 3 ); panelId = tab.attr( "aria-controls" ); panel = $( "#" + panelId ); @@ -272,49 +289,30 @@ if ( $.uiBackCompat === false ) { equal( ui.panel.length, 1, "panel length" ); strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" ); equal( ui.panel.find( "p" ).length, 1, "panel html" ); - state( element, 0, 0, 1, 0, 0 ); - tabsload1(); + state( element, 0, 0, 0, 1, 0 ); + tabsload2(); }); - element.tabs({ active: 2 }); - - function tabsload1() { - // .option() - element.one( "tabsload", function( event, ui ) { - tab = element.find( ".ui-tabs-nav li" ).eq( 3 ); - panelId = tab.attr( "aria-controls" ); - panel = $( "#" + panelId ); - - ok( !( "originalEvent" in event ), "originalEvent" ); - equal( ui.tab.length, 1, "tab length" ); - strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" ); - equal( ui.panel.length, 1, "panel length" ); - strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" ); - equal( ui.panel.find( "p" ).length, 1, "panel html" ); - state( element, 0, 0, 0, 1, 0 ); - tabsload2(); - }); - element.tabs( "option", "active", 3 ); - } + element.tabs( "option", "active", 3 ); + } - function tabsload2() { - // click, change panel content - element.one( "tabsload", function( event, ui ) { - tab = element.find( ".ui-tabs-nav li" ).eq( 4 ); - panelId = tab.attr( "aria-controls" ); - panel = $( "#" + panelId ); - - equal( event.originalEvent.type, "click", "originalEvent" ); - equal( ui.tab.length, 1, "tab length" ); - strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" ); - equal( ui.panel.length, 1, "panel length" ); - strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" ); - equal( ui.panel.find( "p" ).length, 1, "panel html" ); - state( element, 0, 0, 0, 0, 1 ); - start(); - }); - element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 4 ).click(); - } - }); -} + function tabsload2() { + // click, change panel content + element.one( "tabsload", function( event, ui ) { + tab = element.find( ".ui-tabs-nav li" ).eq( 4 ); + panelId = tab.attr( "aria-controls" ); + panel = $( "#" + panelId ); + + equal( event.originalEvent.type, "click", "originalEvent" ); + equal( ui.tab.length, 1, "tab length" ); + strictEqual( ui.tab[ 0 ], tab[ 0 ], "tab" ); + equal( ui.panel.length, 1, "panel length" ); + strictEqual( ui.panel[ 0 ], panel[ 0 ], "panel" ); + equal( ui.panel.find( "p" ).length, 1, "panel html" ); + state( element, 0, 0, 0, 0, 1 ); + start(); + }); + element.find( ".ui-tabs-nav .ui-tabs-anchor" ).eq( 4 ).click(); + } +}); }( jQuery ) ); diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js index fa6535158..076c3f379 100644 --- a/tests/unit/tabs/tabs_methods.js +++ b/tests/unit/tabs/tabs_methods.js @@ -198,11 +198,7 @@ asyncTest( "load", function() { ok( !( "originalEvent" in event ), "originalEvent" ); equal( uiTab.length, 1, "tab length" ); - if ( $.uiBackCompat === false ) { - strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" ); - } else { - strictEqual( uiTab[ 0 ], tab.find( ".ui-tabs-anchor" )[ 0 ], "tab" ); - } + strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" ); equal( uiPanel.length, 1, "panel length" ); strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" ); equal( uiPanel.find( "p" ).length, 1, "panel html" ); @@ -249,11 +245,7 @@ asyncTest( "load", function() { ok( !( "originalEvent" in event ), "originalEvent" ); equal( uiTab.length, 1, "tab length" ); - if ( $.uiBackCompat === false ) { - strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" ); - } else { - strictEqual( uiTab[ 0 ], tab.find( ".ui-tabs-anchor" )[ 0 ], "tab" ); - } + strictEqual( uiTab[ 0 ], tab[ 0 ], "tab" ); equal( uiPanel.length, 1, "panel length" ); strictEqual( uiPanel[ 0 ], panel[ 0 ], "panel" ); state( element, 0, 0, 0, 1, 0 ); diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 8d6e3bfa7..70a827ace 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -974,18 +974,6 @@ if ( $.uiBackCompat !== false ) { .data( "ui-tabs-destroy", true ); } }); - - // load event - $.widget( "ui.tabs", $.ui.tabs, { - _trigger: function( type, event, data ) { - var _data = $.extend( {}, data ); - if ( type === "load" ) { - _data.panel = _data.panel[ 0 ]; - _data.tab = _data.tab.find( ".ui-tabs-anchor" )[ 0 ]; - } - return this._super( type, event, _data ); - } - }); } })( jQuery ); -- cgit v1.2.3 From 054b208a9990fd71d30285e707ad53dae5a48247 Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 06:10:00 -0400 Subject: Tabs: Removed all templating features. Fixes #7158 - Tabs: Remove add and remove methods. Fixes #7157 - Tabs: Remove templating (idPrefix, tabTemplate, panelTemplate options). Fixes #7149 - Tabs: Remove use of title attribute. --- build/tasks/testswarm.js | 1 - grunt.js | 2 +- tests/unit/all-active.html | 1 - tests/unit/all.html | 1 - tests/unit/subsuite.js | 3 +- tests/unit/tabs/tabs.html | 3 - tests/unit/tabs/tabs_common_deprecated.js | 23 ---- tests/unit/tabs/tabs_deprecated.html | 156 ------------------------- tests/unit/tabs/tabs_deprecated.js | 182 ------------------------------ ui/jquery.ui.tabs.js | 134 ---------------------- 10 files changed, 2 insertions(+), 504 deletions(-) delete mode 100644 tests/unit/tabs/tabs_common_deprecated.js delete mode 100644 tests/unit/tabs/tabs_deprecated.html delete mode 100644 tests/unit/tabs/tabs_deprecated.js (limited to 'ui/jquery.ui.tabs.js') diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js index 244113786..7219bcf0c 100644 --- a/build/tasks/testswarm.js +++ b/build/tasks/testswarm.js @@ -29,7 +29,6 @@ var versions = { //"sortable/sortable.html", "Spinner": "spinner/spinner.html", "Tabs": "tabs/tabs.html", - "Tabs_deprecated": "tabs/tabs_deprecated.html", "Tooltip": "tooltip/tooltip.html", "Widget": "widget/widget.html" }; diff --git a/grunt.js b/grunt.js index 96b53fe95..df7c6096e 100644 --- a/grunt.js +++ b/grunt.js @@ -281,7 +281,7 @@ grunt.initConfig({ files: grunt.file.expandFiles( "tests/unit/**/*.html" ).filter(function( file ) { // disabling everything that doesn't (quite) work with PhantomJS for now // TODO except for all|index|test, try to include more as we go - return !( /(all|all-active|index|test|draggable|droppable|selectable|resizable|sortable|dialog|slider|datepicker|tabs|tabs_deprecated|tooltip)\.html$/ ).test( file ); + return !( /(all|all-active|index|test|draggable|droppable|selectable|resizable|sortable|dialog|slider|datepicker|tabs|tooltip)\.html$/ ).test( file ); }) }, lint: { diff --git a/tests/unit/all-active.html b/tests/unit/all-active.html index 36719acdf..f842aa5cc 100644 --- a/tests/unit/all-active.html +++ b/tests/unit/all-active.html @@ -36,7 +36,6 @@ //"sortable/sortable.html", "spinner/spinner.html", "tabs/tabs.html", - "tabs/tabs_deprecated.html", "tooltip/tooltip.html", "widget/widget.html" ]; diff --git a/tests/unit/all.html b/tests/unit/all.html index c1b5d0383..bc204c976 100644 --- a/tests/unit/all.html +++ b/tests/unit/all.html @@ -36,7 +36,6 @@ //"sortable/sortable.html", "spinner/spinner.html", "tabs/tabs.html", - "tabs/tabs_deprecated.html", "tooltip/tooltip.html", "widget/widget.html" ]; diff --git a/tests/unit/subsuite.js b/tests/unit/subsuite.js index 1a16a9e94..6238cb2b1 100644 --- a/tests/unit/subsuite.js +++ b/tests/unit/subsuite.js @@ -8,8 +8,7 @@ var versions = [ ], additionalTests = { accordion: [ "accordion_deprecated.html" ], - position: [ "position_deprecated.html" ], - tabs: [ "tabs_deprecated.html" ] + position: [ "position_deprecated.html" ] }; window.testAllVersions = function( widget ) { diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html index e6c954727..7c7982303 100644 --- a/tests/unit/tabs/tabs.html +++ b/tests/unit/tabs/tabs.html @@ -5,9 +5,6 @@ jQuery UI Tabs Test Suite - diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js deleted file mode 100644 index a21489cda..000000000 --- a/tests/unit/tabs/tabs_common_deprecated.js +++ /dev/null @@ -1,23 +0,0 @@ -TestHelpers.commonWidgetTests( "tabs", { - defaults: { - active: null, - collapsible: false, - disabled: false, - event: "click", - heightStyle: "content", - hide: null, - idPrefix: "ui-tabs-", - panelTemplate: "
    ", - show: null, - tabTemplate: "
  • #{label}
    • ", - - // callbacks - activate: null, - add: null, - beforeActivate: null, - beforeLoad: null, - create: null, - load: null, - remove: null - } -}); diff --git a/tests/unit/tabs/tabs_deprecated.html b/tests/unit/tabs/tabs_deprecated.html deleted file mode 100644 index 3c476d0b4..000000000 --- a/tests/unit/tabs/tabs_deprecated.html +++ /dev/null @@ -1,156 +0,0 @@ - - - - - jQuery UI Tabs Test Suite - - - - - - - - - - - - - - - - - - - - - -

    jQuery UI Tabs Test Suite

    -

    -
    -

    -
      -
      - -
      -
        -
      • 1
        • -
      • 2
        • -
      • 3
        • -
      -
      -
      -
      -
      - -
      - -
      -
      -
      -
      - -
      -
      -
        -
      • 1
        • -
      -
      -
      - -
      -
        -
      • 1
        • -
      -
        -
      1. 1
        2. -
      -
      - -
      -
        -
      1. 1
        2. -
      -
        -
      • 1
        • -
      -
      - -
      -
      -
        -
        -
        - -
        -
          -
        • 1 -
            -
          • 3
            • -
          • 4
            • -
          -
          • -
        • 2
          • -
        -
        -
        -
        - -
        -
          -
        • 1
          • -
        • 2
          • -
        -
        -
        -
        - -
        -
        -
          -
        • 1
          • -
        • 2
          • -
        -
        -

        Lorem ipsum

        -

        Lorem ipsum

        -

        Lorem ipsum

        -
        -
        -

        Lorem ipsum

        -
        -
        -
        - -
        -
          -
        • not a tab
          • -
        • tab
          • -
        -
        -
        - -
        - - diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js deleted file mode 100644 index 9d3599494..000000000 --- a/tests/unit/tabs/tabs_deprecated.js +++ /dev/null @@ -1,182 +0,0 @@ -(function( $ ) { - -var state = TestHelpers.tabs.state; - -module( "tabs (deprecated): core" ); - -test( "panel ids", function() { - expect( 2 ); - - var element = $( "#tabs2" ).tabs(); - - element.one( "tabsbeforeload", function( event, ui ) { - equal( ui.panel.attr( "id" ), "∫ßáö_Սե", "from title attribute" ); - event.preventDefault(); - }); - element.tabs( "option", "active", 4 ); - - element.one( "tabsbeforeload", function( event, ui ) { - ok( /^ui-tabs-\d+$/.test( ui.panel.attr( "id" ) ), "generated id" ); - event.preventDefault(); - }); - element.tabs( "option", "active", 2 ); -}); - -module( "tabs (deprecated): options" ); - -test( "idPrefix", function() { - expect( 1 ); - - $( "#tabs2" ) - .one( "tabsbeforeload", function( event, ui ) { - ok( /^testing-\d+$/.test( ui.panel.attr( "id" ) ), "generated id" ); - event.preventDefault(); - }) - .tabs({ - idPrefix: "testing-", - active: 2 - }); -}); - -test( "tabTemplate + panelTemplate", function() { - // defaults are tested in the add method test - expect( 11 ); - - var tab, anchor, - element = $( "#tabs2" ).tabs({ - tabTemplate: "
      • #{label}
        • ", - panelTemplate: "
        " - }); - element.one( "tabsadd", function( event, ui ) { - var anchor = $( ui.tab ); - equal( ui.index, 5, "ui.index" ); - equal( anchor.text(), "New", "ui.tab" ); - equal( anchor.attr( "href" ), "http://example.com/#new", "tab href" ); - ok( anchor.parent().hasClass( "customTab" ), "tab custom class" ); - equal( ui.panel.id, "new", "ui.panel" ); - ok( $( ui.panel ).hasClass( "customPanel" ), "panel custom class" ); - }); - element.tabs( "add", "#new", "New" ); - tab = element.find( ".ui-tabs-nav li" ).last(); - anchor = tab.find( ".ui-tabs-anchor" ); - equal( tab.text(), "New", "label" ); - ok( tab.hasClass( "customTab" ), "tab custom class" ); - equal( anchor.attr( "href" ), "http://example.com/#new", "href" ); - equal( tab.attr( "aria-controls" ), "new", "aria-controls" ); - ok( element.find( "#new" ).hasClass( "customPanel" ), "panel custom class" ); -}); - -module( "tabs (deprecated): methods" ); - -test( "add", function() { - expect( 28 ); - - var tab, anchor, - element = $( "#tabs1" ).tabs(); - - function stripLeadingSlash( str ) { - return str.substr( str.charAt( 0 ) === "/" ? 1 : 0 ); - } - - state( element, 1, 0, 0 ); - - // add without index - element.one( "tabsadd", function( event, ui ) { - equal( ui.index, 3, "ui.index" ); - equal( $( ui.tab ).text(), "New", "ui.tab" ); - equal( ui.panel.id, "new", "ui.panel" ); - }); - element.tabs( "add", "#new", "New" ); - state( element, 1, 0, 0, 0 ); - tab = element.find( ".ui-tabs-nav li" ).last(); - anchor = tab.find( ".ui-tabs-anchor" ); - equal( tab.text(), "New", "label" ); - equal( stripLeadingSlash( anchor[0].pathname ), stripLeadingSlash( location.pathname ), "href pathname" ); - equal( anchor[0].hash, "#new", "href hash" ); - equal( tab.attr( "aria-controls" ), "new", "aria-controls" ); - ok( !tab.hasClass( "ui-state-hover" ), "not hovered" ); - anchor.simulate( "mouseover" ); - ok( tab.hasClass( "ui-state-hover" ), "hovered" ); - anchor.simulate( "click" ); - state( element, 0, 0, 0, 1 ); - - // add remote tab with index - element.one( "tabsadd", function( event, ui ) { - equal( ui.index, 1, "ui.index" ); - equal( $( ui.tab ).text(), "New Remote", "ui.tab" ); - equal( ui.panel.id, $( ui.tab ).closest( "li" ).attr( "aria-controls" ), "ui.panel" ); - }); - element.tabs( "add", "data/test.html", "New Remote", 1 ); - state( element, 0, 0, 0, 0, 1 ); - tab = element.find( ".ui-tabs-nav li" ).eq( 1 ); - anchor = tab.find( ".ui-tabs-anchor" ); - equal( tab.text(), "New Remote", "label" ); - equal( stripLeadingSlash( stripLeadingSlash( - anchor[0].pathname.replace( stripLeadingSlash( location.pathname ).split( "/" ).slice( 0, -1 ).join( "/" ), "" ) - ) ), "data/test.html", "href" ); - ok( /^ui-tabs-\d+$/.test( tab.attr( "aria-controls" ) ), "aria controls" ); - ok( !tab.hasClass( "ui-state-hover" ), "not hovered" ); - anchor.simulate( "mouseover" ); - ok( tab.hasClass( "ui-state-hover" ), "hovered" ); - anchor.simulate( "click" ); - state( element, 0, 1, 0, 0, 0 ); - - // add to empty tab set - element = $( "
          " ).tabs(); - equal( element.tabs( "option", "active" ), false, "active: false on init" ); - element.one( "tabsadd", function( event, ui ) { - equal( ui.index, 0, "ui.index" ); - equal( $( ui.tab ).text(), "First", "ui.tab" ); - equal( ui.panel.id, "first", "ui.panel" ); - }); - element.tabs( "add", "#first", "First" ); - state( element, 1 ); - equal( element.tabs( "option", "active" ), 0, "active: 0 after add" ); -}); - -test( "#5069 - ui.tabs.add creates two tab panels when using a full URL", function() { - expect( 2 ); - - var element = $( "#tabs2" ).tabs(); - equal( element.children( "div" ).length, element.find( ".ui-tabs-nav li" ).length ); - element.tabs( "add", "/new", "New" ); - equal( element.children( "div" ).length, element.find( ".ui-tabs-nav li" ).length ); -}); - -test( "remove", function() { - expect( 17 ); - - var element = $( "#tabs1" ).tabs({ active: 1 }); - state( element, 0, 1, 0 ); - - element.one( "tabsremove", function( event, ui ) { - equal( ui.index, -1, "ui.index" ); - equal( $( ui.tab ).text(), "2", "ui.tab" ); - equal( ui.panel.id, "fragment-2", "ui.panel" ); - }); - element.tabs( "remove", 1 ); - state( element, 0, 1 ); - equal( element.tabs( "option", "active" ), 1 ); - equal( element.find( ".ui-tabs-nav li a[href$='fragment-2']" ).length, 0, - "remove correct list item" ); - equal( element.find( "#fragment-2" ).length, 0, "remove correct panel" ); - - element.one( "tabsremove", function( event, ui ) { - equal( ui.index, -1, "ui.index" ); - equal( $( ui.tab ).text(), "3", "ui.tab" ); - equal( ui.panel.id, "fragment-3", "ui.panel" ); - }); - element.tabs( "remove", 1 ); - state( element, 1 ); - equal( element.tabs( "option", "active"), 0 ); - - element.one( "tabsremove", function( event, ui ) { - equal( ui.index, -1, "ui.index" ); - equal( $( ui.tab ).text(), "1", "ui.tab" ); - equal( ui.panel.id, "fragment-1", "ui.panel" ); - }); - element.tabs( "remove", 0 ); - equal( element.tabs( "option", "active" ), false ); -}); - -}( jQuery ) ); diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 70a827ace..9918d6de2 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -842,138 +842,4 @@ $.widget( "ui.tabs", { } }); -// DEPRECATED -if ( $.uiBackCompat !== false ) { - - // helper method for a lot of the back compat extensions - $.ui.tabs.prototype._ui = function( tab, panel ) { - return { - tab: tab, - panel: panel, - index: this.anchors.index( tab ) - }; - }; - - // add/remove methods and events - $.widget( "ui.tabs", $.ui.tabs, { - options: { - add: null, - remove: null, - tabTemplate: "
        • #{label}
          • " - }, - - add: function( url, label, index ) { - if ( index === undefined ) { - index = this.anchors.length; - } - - var doInsertAfter, panel, - options = this.options, - li = $( options.tabTemplate - .replace( /#\{href\}/g, url ) - .replace( /#\{label\}/g, label ) ), - id = !url.indexOf( "#" ) ? - url.replace( "#", "" ) : - this._tabId( li ); - - li.addClass( "ui-state-default ui-corner-top" ).data( "ui-tabs-destroy", true ); - li.attr( "aria-controls", id ); - - doInsertAfter = index >= this.tabs.length; - - // try to find an existing element before creating a new one - panel = this.element.find( "#" + id ); - if ( !panel.length ) { - panel = this._createPanel( id ); - if ( doInsertAfter ) { - if ( index > 0 ) { - panel.insertAfter( this.panels.eq( -1 ) ); - } else { - panel.appendTo( this.element ); - } - } else { - panel.insertBefore( this.panels[ index ] ); - } - } - panel.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" ).hide(); - - if ( doInsertAfter ) { - li.appendTo( this.tablist ); - } else { - li.insertBefore( this.tabs[ index ] ); - } - - options.disabled = $.map( options.disabled, function( n ) { - return n >= index ? ++n : n; - }); - - this.refresh(); - if ( this.tabs.length === 1 && options.active === false ) { - this.option( "active", 0 ); - } - - this._trigger( "add", null, this._ui( this.anchors[ index ], this.panels[ index ] ) ); - return this; - }, - - remove: function( index ) { - index = this._getIndex( index ); - var options = this.options, - tab = this.tabs.eq( index ).remove(), - panel = this._getPanelForTab( tab ).remove(); - - // If selected tab was removed focus tab to the right or - // in case the last tab was removed the tab to the left. - // We check for more than 2 tabs, because if there are only 2, - // then when we remove this tab, there will only be one tab left - // so we don't need to detect which tab to activate. - if ( tab.hasClass( "ui-tabs-active" ) && this.anchors.length > 2 ) { - this._activate( index + ( index + 1 < this.anchors.length ? 1 : -1 ) ); - } - - options.disabled = $.map( - $.grep( options.disabled, function( n ) { - return n !== index; - }), - function( n ) { - return n >= index ? --n : n; - }); - - this.refresh(); - - this._trigger( "remove", null, this._ui( tab.find( "a" )[ 0 ], panel[ 0 ] ) ); - return this; - } - }); - - // panel ids (idPrefix option + title attribute) - $.widget( "ui.tabs", $.ui.tabs, { - options: { - idPrefix: "ui-tabs-" - }, - - _tabId: function( tab ) { - var a = tab.is( "li" ) ? tab.find( "a[href]" ) : tab; - a = a[0]; - return $( a ).closest( "li" ).attr( "aria-controls" ) || - a.title && a.title.replace( /\s/g, "_" ).replace( /[^\w\u00c0-\uFFFF\-]/g, "" ) || - this.options.idPrefix + getNextTabId(); - } - }); - - // _createPanel method - $.widget( "ui.tabs", $.ui.tabs, { - options: { - panelTemplate: "
          " - }, - - _createPanel: function( id ) { - return $( this.options.panelTemplate ) - .attr( "id", id ) - .addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" ) - .data( "ui-tabs-destroy", true ); - } - }); -} - })( jQuery ); -- cgit v1.2.3 From da1255a392a0132711dacce7283df221621f098b Mon Sep 17 00:00:00 2001 From: Scott González Date: Fri, 26 Oct 2012 14:34:03 -0400 Subject: Tabs: Removed overflow workaround for IE6. --- ui/jquery.ui.tabs.js | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 9918d6de2..f81771434 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -487,18 +487,10 @@ $.widget( "ui.tabs", { }, _setupHeightStyle: function( heightStyle ) { - var maxHeight, overflow, + var maxHeight, parent = this.element.parent(); if ( heightStyle === "fill" ) { - // IE 6 treats height like minHeight, so we need to turn off overflow - // in order to get a reliable height - // we use the minHeight support test because we assume that only - // browsers that don't support minHeight will treat height as minHeight - if ( !$.support.minHeight ) { - overflow = parent.css( "overflow" ); - parent.css( "overflow", "hidden"); - } maxHeight = parent.height(); this.element.siblings( ":visible" ).each(function() { var elem = $( this ), @@ -509,9 +501,6 @@ $.widget( "ui.tabs", { } maxHeight -= elem.outerHeight( true ); }); - if ( overflow ) { - parent.css( "overflow", overflow ); - } this.element.children().not( this.panels ).each(function() { maxHeight -= $( this ).outerHeight( true ); -- cgit v1.2.3 From c6b52db892703ba14153800dbf620db509acb9e6 Mon Sep 17 00:00:00 2001 From: Scott González Date: Tue, 6 Nov 2012 08:01:11 -0500 Subject: Tabs: Encode spaces from window.location. Fixes #8777 - Tabs fail in Safari 5.1 when window.location contains a space. --- ui/jquery.ui.tabs.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'ui/jquery.ui.tabs.js') diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index f81771434..49b6d7bf1 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -23,7 +23,12 @@ function getNextTabId() { function isLocal( anchor ) { return anchor.hash.length > 1 && - anchor.href.replace( rhash, "" ) === location.href.replace( rhash, "" ); + anchor.href.replace( rhash, "" ) === + location.href.replace( rhash, "" ) + // support: Safari 5.1 + // Safari 5.1 doesn't encode spaces in window.location + // but it does encode spaces from anchors (#8777) + .replace( /\s/g, "%20" ); } $.widget( "ui.tabs", { -- cgit v1.2.3 From fd48568c402847df8af59166c33549f0d19feb4b Mon Sep 17 00:00:00 2001 From: Scott González Date: Fri, 9 Nov 2012 14:52:57 -0500 Subject: Tabs: Show panels on destroy. Fixes #8795 - Tabs: 'display: none;' attribute is not removed from tabs when destroy is called. --- tests/unit/testsuite.js | 28 ++++++++++++++++++++++++++++ ui/jquery.ui.tabs.js | 2 ++ 2 files changed, 30 insertions(+) (limited to 'ui/jquery.ui.tabs.js') diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js index c0ab490e1..bf17670f7 100644 --- a/tests/unit/testsuite.js +++ b/tests/unit/testsuite.js @@ -205,6 +205,33 @@ window.domEqual = function( selector, modifier, message ) { "title" ]; + function getElementStyles( elem ) { + var key, len, + style = elem.ownerDocument.defaultView ? + elem.ownerDocument.defaultView.getComputedStyle( elem, null ) : + elem.currentStyle, + styles = {}; + + if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) { + len = style.length; + while ( len-- ) { + key = style[ len ]; + if ( typeof style[ key ] === "string" ) { + styles[ $.camelCase( key ) ] = style[ key ]; + } + } + // support: Opera, IE <9 + } else { + for ( key in style ) { + if ( typeof style[ key ] === "string" ) { + styles[ key ] = style[ key ]; + } + } + } + + return styles; + } + function extract( elem ) { if ( !elem || !elem.length ) { QUnit.push( false, actual, expected, @@ -222,6 +249,7 @@ window.domEqual = function( selector, modifier, message ) { var value = elem.attr( attr ); result[ attr ] = value !== undefined ? value : ""; }); + result.style = getElementStyles( elem[ 0 ] ); result.events = $._data( elem[ 0 ], "events" ); result.data = $.extend( {}, elem.data() ); delete result.data[ $.expando ]; diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 49b6d7bf1..5b5227128 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -716,6 +716,8 @@ $.widget( "ui.tabs", { } }); + this.panels.show(); + if ( this.options.heightStyle !== "content" ) { this.panels.css( "height", "" ); } -- cgit v1.2.3