http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89085
Revision: 89085 Author: krinkle Date: 2011-05-29 04:11:10 +0000 (Sun, 29 May 2011) Log Message: ----------- Fix issues raised through TestSwarm * Instead of delete window.foobar whitelist the global in QUnit.config.pollution ** the reason either is needed is to make QUnit's "noglobal" option useful) ** delete window.foo throws an "TypeError: Object doesn't support this action" in Internet Explorer. -> http://perfectionkills.com/understanding-delete/ * Remove other globals introduced Modified Paths: -------------- trunk/phase3/resources/mediawiki/mediawiki.js trunk/phase3/tests/qunit/suites/resources/mediawiki/mediawiki.js trunk/phase3/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js Modified: trunk/phase3/resources/mediawiki/mediawiki.js =================================================================== --- trunk/phase3/resources/mediawiki/mediawiki.js 2011-05-29 03:23:52 UTC (rev 89084) +++ trunk/phase3/resources/mediawiki/mediawiki.js 2011-05-29 04:11:10 UTC (rev 89085) @@ -246,11 +246,12 @@ * Gets a message object, similar to wfMessage() * * @param key string Key of message to get - * @param parameters mixed First argument in a list of variadic arguments, + * @param parameter_1 mixed First argument in a list of variadic arguments, * each a parameter for $N replacement in messages. * @return Message */ this.message = function( key, parameter_1 /* [, parameter_2] */ ) { + var parameters; // Support variadic arguments if ( parameter_1 !== undefined ) { parameters = $.makeArray( arguments ); Modified: trunk/phase3/tests/qunit/suites/resources/mediawiki/mediawiki.js =================================================================== --- trunk/phase3/tests/qunit/suites/resources/mediawiki/mediawiki.js 2011-05-29 03:23:52 UTC (rev 89084) +++ trunk/phase3/tests/qunit/suites/resources/mediawiki/mediawiki.js 2011-05-29 04:11:10 UTC (rev 89085) @@ -64,8 +64,8 @@ deepEqual( 'anotherGlobalMapChecker' in window, true, 'new mw.Map( true ) did store its values in the global window object' ); ok( window.anotherGlobalMapChecker, 'new mw.Map( true ) did store its values in the global window object' ); - // Clean up - delete window.anotherGlobalMapChecker; + // Whitelist this global variable for QUnit 'noglobal' mode + QUnit.config.pollution.push( 'anotherGlobalMapChecker' ); }); test( 'mw.config', function(){ @@ -111,6 +111,7 @@ deepEqual( goodbye.exists(), false, 'Message.exists() returns false for inexisting messages' ); equal( goodbye.toString(), '<goodbye>', 'Message.toString() returns <key> if key does not exist' ); + }); test( 'mw.msg', function(){ Modified: trunk/phase3/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js =================================================================== --- trunk/phase3/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js 2011-05-29 03:23:52 UTC (rev 89084) +++ trunk/phase3/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js 2011-05-29 04:11:10 UTC (rev 89085) @@ -50,7 +50,7 @@ test( 'addCSS', function(){ expect(3); - window.a = mw.util.addCSS( '#bodyContent { visibility: hidden; }' ); + var a = mw.util.addCSS( '#bodyContent { visibility: hidden; }' ); ok( a, 'function works' ); deepEqual( a.disabled, false, 'property "disabled" is available and set to false' ); _______________________________________________ MediaWiki-CVS mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
