https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112632
Revision: 112632
Author: reedy
Date: 2012-02-28 20:41:32 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
MFT r112170
Modified Paths:
--------------
branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js
Property Changed:
----------------
branches/wmf/1.19wmf1/
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169,112172-112173,112179,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563,112566
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169-112170,112172-112173,112179,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563,112566
Modified: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js
===================================================================
--- branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js 2012-02-28
20:36:33 UTC (rev 112631)
+++ branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.util.js 2012-02-28
20:41:32 UTC (rev 112632)
@@ -2,7 +2,7 @@
* Implements mediaWiki.util library
*/
( function ( $, mw ) {
-"use strict";
+ "use strict";
// Local cache and alias
var util = {
@@ -121,19 +121,19 @@
* @param str string String to be encoded
*/
wikiUrlencode: function ( str ) {
- return this.rawurlencode( str )
+ return util.rawurlencode( str )
.replace( /%20/g, '_' ).replace( /%3A/g, ':'
).replace( /%2F/g, '/' );
},
/**
* Get the link to a page name (relative to wgServer)
*
- * @param str string Page name to get the link for.
- * @return string Location for a page with name of 'str' or
boolean false on error.
+ * @param str String: Page name to get the link for.
+ * @return String: Location for a page with name of 'str' or
boolean false on error.
*/
wikiGetlink: function ( str ) {
return mw.config.get( 'wgArticlePath' ).replace( '$1',
- this.wikiUrlencode( str || mw.config.get(
'wgPageName' ) ) );
+ util.wikiUrlencode( typeof str === 'string' ?
str : mw.config.get( 'wgPageName' ) ) );
},
/**
@@ -384,7 +384,7 @@
$link.attr( 'title', tooltip );
}
if ( accesskey && tooltip ) {
- this.updateTooltipAccessKeys( $link );
+ util.updateTooltipAccessKeys( $link );
}
// Where to put our node ?
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
