diff options
| author | Felix Nagel <info@felixnagel.com> | 2017-08-26 13:08:14 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2017-08-26 13:08:14 +0200 |
| commit | 1b885ff76899fb70cce28371968d314ea74b7d7a (patch) | |
| tree | 1a3a19be9d874f9daffd1238950c073ec086ffc2 /ui/widgets/tabs.js | |
| parent | 2b611bad90fa6f19e3bf02912c6cd5c08903c993 (diff) | |
| parent | 74f8a0ac952f6f45f773312292baef1c26d81300 (diff) | |
| download | jquery-ui-datepicker.tar.gz jquery-ui-datepicker.zip | |
Merge branch 'master' into datepickerdatepicker
# Conflicts:
# ui/i18n/datepicker-pt.js
Diffstat (limited to 'ui/widgets/tabs.js')
| -rw-r--r-- | ui/widgets/tabs.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/widgets/tabs.js b/ui/widgets/tabs.js index 58a65ebe8..14f94ae83 100644 --- a/ui/widgets/tabs.js +++ b/ui/widgets/tabs.js @@ -96,7 +96,7 @@ $.widget( "ui.tabs", { // Take disabling tabs via class attribute from HTML // into account and update option properly. if ( $.isArray( options.disabled ) ) { - options.disabled = $.unique( options.disabled.concat( + options.disabled = $.uniqueSort( options.disabled.concat( $.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) { return that.tabs.index( li ); } ) |