Merge "resources: Move QUnit to resources/lib/qunitjs"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 10 Feb 2015 15:06:01 +0000 (15:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 10 Feb 2015 15:06:01 +0000 (15:06 +0000)
1  2 
resources/Resources.php

diff --combined resources/Resources.php
@@@ -266,8 -266,8 +266,8 @@@ return array
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.qunit' => array(
-               'scripts' => 'resources/lib/jquery/jquery.qunit.js',
-               'styles' => 'resources/lib/jquery/jquery.qunit.css',
+               'scripts' => 'resources/lib/qunitjs/qunit.js',
+               'styles' => 'resources/lib/qunitjs/qunit.css',
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        /* MediaWiki */
  
        'mediawiki' => array(
 -              'scripts' => 'resources/src/mediawiki/mediawiki.js',
 +              'scripts' => array(
 +                      'resources/src/mediawiki/mediawiki.js',
 +                      'resources/src/mediawiki/mediawiki.startUp.js',
 +              ),
                'debugScripts' => 'resources/src/mediawiki/mediawiki.log.js',
                'raw' => true,
                'targets' => array( 'desktop', 'mobile' ),