Merge "Fixed dependencies for jquery.collapsibleTabs"

diff --combined resources/Resources.php
index 4ec8b3e,e1b7659..afa9bb2
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1,24 -1,4 +1,24 @@@
  <?php
 +/**
 + * Definition of core ResourceLoader modules.
 + *
 + * This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
 + * the Free Software Foundation; either version 2 of the License, or
 + * (at your option) any later version.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License along
 + * with this program; if not, write to the Free Software Foundation, Inc.,
 + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 + * http://www.gnu.org/copyleft/gpl.html
 + *
 + * @file
 + */
  
  return array(
  
@@@ -108,7 -88,6 +108,7 @@@
        'jquery' => array(
                'scripts' => 'resources/jquery/jquery.js',
                'debugRaw' => false,
 +              'targets' => array( 'desktop', 'mobile' ),
        ),
  
        /* jQuery Plugins */
@@@ -146,6 -125,7 +146,7 @@@
        ),
        'jquery.collapsibleTabs' => array(
                'scripts' => 'resources/jquery/jquery.collapsibleTabs.js',
+               'dependencies' => 'jquery.delayedBind',
        ),
        'jquery.color' => array(
                'scripts' => 'resources/jquery/jquery.color.js',
@@@ -179,10 -159,6 +180,10 @@@
        'jquery.getAttrs' => array(
                'scripts' => 'resources/jquery/jquery.getAttrs.js',
        ),
 +      'jquery.hidpi' => array(
 +              'scripts' => 'resources/jquery/jquery.hidpi.js',
 +              'targets' => array( 'desktop', 'mobile' ),
 +      ),
        'jquery.highlightText' => array(
                'scripts' => 'resources/jquery/jquery.highlightText.js',
                'dependencies' => 'jquery.mwExtension',
@@@ -551,7 -527,6 +552,7 @@@
                'scripts' => 'resources/mediawiki/mediawiki.js',
                'debugScripts' => 'resources/mediawiki/mediawiki.log.js',
                'debugRaw' => false,
 +              'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.api' => array(
                'scripts' => 'resources/mediawiki.api/mediawiki.api.js',
@@@ -627,13 -602,6 +628,13 @@@
                        'feedback-bugnew',
                ),
        ),
 +      'mediawiki.hidpi' => array(
 +              'scripts' => 'resources/mediawiki/mediawiki.hidpi.js',
 +              'dependencies' => array(
 +                      'jquery.hidpi',
 +              ),
 +              'targets' => array( 'desktop', 'mobile' ),
 +      ),
        'mediawiki.htmlform' => array(
                'scripts' => 'resources/mediawiki/mediawiki.htmlform.js',
        ),
@@@ -647,19 -615,6 +648,19 @@@
        'mediawiki.notify' => array(
                'scripts' => 'resources/mediawiki/mediawiki.notify.js',
        ),
 +      'mediawiki.searchSuggest' => array(
 +              'scripts' => 'resources/mediawiki/mediawiki.searchSuggest.js',
 +              'messages' => array(
 +                      'searchsuggest-search',
 +                      'searchsuggest-containing',
 +              ),
 +              'dependencies' => array(
 +                      'jquery.autoEllipsis',
 +                      'jquery.client',
 +                      'jquery.placeholder',
 +                      'jquery.suggestions',
 +              ),
 +      ),
        'mediawiki.Title' => array(
                'scripts' => 'resources/mediawiki/mediawiki.Title.js',
                'dependencies' => 'mediawiki.util',
@@@ -947,6 -902,13 +948,6 @@@
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => 'mediawiki.legacy.wikibits',
        ),
 -      'mediawiki.legacy.mwsuggest' => array(
 -              'scripts' => 'common/mwsuggest.js',
 -              'remoteBasePath' => $GLOBALS['wgStylePath'],
 -              'localBasePath' => $GLOBALS['wgStyleDirectory'],
 -              'dependencies' => 'mediawiki.legacy.wikibits',
 -              'messages' => array( 'search-mwsuggest-enabled', 'search-mwsuggest-disabled' ),
 -      ),
        'mediawiki.legacy.protect' => array(
                'scripts' => 'common/protect.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],