From 32adabfca4040e24ba0270cb9cfe94b60df5ddb8 Mon Sep 17 00:00:00 2001 From: Krinkle Date: Thu, 21 Jul 2011 16:41:21 +0000 Subject: [PATCH] Remove mw.util.inArray - redundant and makes it even more confusing than jQuery's "inArray" already was. - Reverts r92261 - Fixed usage in /trunk/* -- http://toolserver.org/~krinkle/wikimedia-svn-search/view.php?id=245&hash=4ef50cd2f7017954e562155ccceba878 While at it, also took take of the r92297 fixme. Item argument must be before array argument. --- .../mediawiki.page/mediawiki.page.ajaxCategories.js | 2 +- resources/mediawiki/mediawiki.util.js | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/resources/mediawiki.page/mediawiki.page.ajaxCategories.js b/resources/mediawiki.page/mediawiki.page.ajaxCategories.js index da73692c4e..7c7ef908ba 100644 --- a/resources/mediawiki.page/mediawiki.page.ajaxCategories.js +++ b/resources/mediawiki.page/mediawiki.page.ajaxCategories.js @@ -44,7 +44,7 @@ mw.ajaxCategories = function( options ) { var _saveAllButton; var _cancelAllButton; - var _multiEdit = mw.util.inArray( mw.config.get( 'wgUserGroups' ), 'user' ); + var _multiEdit = $.inArray( 'user', mw.config.get( 'wgUserGroups' ) ) !== -1; /** * Helper function for $.fn.suggestion diff --git a/resources/mediawiki/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js index 758f915ca5..ebd63ef275 100644 --- a/resources/mediawiki/mediawiki.util.js +++ b/resources/mediawiki/mediawiki.util.js @@ -108,17 +108,6 @@ /* Main body */ - /** - * Wether a value is in an array. Using jQuery's inArray cross-browser utility, - * (for browsers without Array indexOf support). - * @param val {Mixed} Needle - * @param arr {Array} Haystack - * @return Boolean - */ - 'inArray' : function( val, arr ) { - return $.inArray( val, arr ) !== -1; - }, - /** * Encode the string like PHP's rawurlencode * -- 2.20.1