http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70198
Revision: 70198
Author: tparscal
Date: 2010-07-30 18:33:19 +0000 (Fri, 30 Jul 2010)
Log Message:
-----------
Cleaned up some code style
Modified Paths:
--------------
branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.ajax.js
branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.ajaxwatch.js
branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.edit.js
branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.history.js
branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.mwsuggest.js
branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.protect.js
branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.wikibits.js
Modified: branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.ajax.js
===================================================================
--- branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.ajax.js
2010-07-30 18:26:51 UTC (rev 70197)
+++ branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.ajax.js
2010-07-30 18:33:19 UTC (rev 70198)
@@ -15,7 +15,7 @@
/* Global Variables */
'sajax_debug_mode': false,
- 'sajax_debug_mode': "GET",
+ 'sajax_debug_mode': 'GET',
/* Functions */
@@ -46,7 +46,7 @@
mw.legacy.sajax_debug( 'sajax_init_object() called..' );
var request = false;
try {
- // Try the "new" style before ActiveX so we don't
unnecessarily trigger warnings in IE 7 when the user's
+ // Try the 'new' style before ActiveX so we don't
unnecessarily trigger warnings in IE 7 when the user's
// security settings are set to prompt about ActiveX
usage
request = new XMLHttpRequest();
} catch ( e ) {
@@ -108,7 +108,7 @@
try {
request.open( mw.legacy.sajax_request_type, uri, true );
} catch ( e ) {
- if ( window.location.hostname == "localhost" ) {
+ if ( window.location.hostname == 'localhost' ) {
alert(
'Your browser blocks XMLHttpRequest to
\'localhost\', ' +
'try using a real hostname for
development/testing.'
Modified:
branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.ajaxwatch.js
===================================================================
--- branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.ajaxwatch.js
2010-07-30 18:26:51 UTC (rev 70197)
+++ branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.ajaxwatch.js
2010-07-30 18:33:19 UTC (rev 70198)
@@ -74,9 +74,9 @@
mw.legacy.jsMsg( response.message, 'watch' );
// Bug 12395 - update the watch checkbox on edit pages
when the page is watched or unwatched via the tab.
if ( response.watched !== undefined ) {
- $j("#wpWatchthis").attr( 'checked', '1' );
+ $j( '#wpWatchthis' ).attr( 'checked', '1' );
} else {
- $j("#wpWatchthis").removeAttr( 'checked' );
+ $j( '#wpWatchthis' ).removeAttr( 'checked' );
}
}
} );
Modified: branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.edit.js
===================================================================
--- branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.edit.js
2010-07-30 18:26:51 UTC (rev 70197)
+++ branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.edit.js
2010-07-30 18:33:19 UTC (rev 70198)
@@ -50,7 +50,7 @@
mw.legacy.insertTags( item.tagOpen,
item.tagClose, item.sampleText );
// Click tracking
if ( typeof $.trackAction != 'undefined' ) {
- $.trackAction( 'oldedit.' +
item.speedTip.replace( / /g, "-" ) );
+ $.trackAction( 'oldedit.' +
item.speedTip.replace( / /g, '-' ) );
}
return false;
} )
Modified:
branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.history.js
===================================================================
--- branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.history.js
2010-07-30 18:26:51 UTC (rev 70197)
+++ branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.history.js
2010-07-30 18:33:19 UTC (rev 70198)
@@ -14,7 +14,7 @@
var inputs = parent.getElementsByTagName('input');
var radios = [];
for (var i = 0; i < inputs.length; i++) {
- if (inputs[i].name == "diff" || inputs[i].name ==
"oldid") {
+ if (inputs[i].name == 'diff' || inputs[i].name ==
'oldid') {
radios[radios.length] = inputs[i];
}
}
@@ -46,7 +46,7 @@
oli.classNameOriginal = '';
}
- oli.className =
"selected "+oli.classNameOriginal;
+ oli.className =
'selected '+oli.classNameOriginal;
return false;
}
} else if (inputs[0].checked) {
@@ -67,7 +67,7 @@
lis[i].classNameOriginal = '';
}
- lis[i].className = "selected
"+lis[i].classNameOriginal;
+ lis[i].className = 'selected
'+lis[i].classNameOriginal;
oli = lis[i];
} else { // no radio is checked in this row
if (!oli) {
Modified:
branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.mwsuggest.js
===================================================================
--- branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.mwsuggest.js
2010-07-30 18:26:51 UTC (rev 70197)
+++ branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.mwsuggest.js
2010-07-30 18:33:19 UTC (rev 70198)
@@ -428,9 +428,9 @@
var r = os_timer.r;
var query = os_timer.query;
os_timer = null;
- var path = wgMWSuggestTemplate.replace( "{namespaces}",
os_getNamespaces( r ) )
-
.replace( "{dbname}", wgDBname )
-
.replace( "{searchTerms}", os_encodeQuery( query ) );
+ var path = wgMWSuggestTemplate.replace( '{namespaces}',
os_getNamespaces( r ) )
+
.replace( '{dbname}', wgDBname )
+
.replace( '{searchTerms}', os_encodeQuery( query ) );
// try to get from cache, if not fetch using ajax
var cached = os_cache[path];
if( cached != null && cached != undefined ) {
@@ -448,7 +448,7 @@
xmlhttp.send( null );
} catch ( e ) {
if ( window.location.hostname ==
'localhost' ) {
- alert( "Your browser blocks
XMLHttpRequest to 'localhost', try using a real hostname for
development/testing." );
+ alert( 'Your browser blocks
XMLHttpRequest to "localhost", try using a real hostname for
development/testing.' );
}
throw e;
}
@@ -475,7 +475,7 @@
}
// schedule delayed fetching of results
if( timeout != 0 ) {
- os_timer = new os_Timer( setTimeout(
"os_delayedFetch()", timeout ), r, query );
+ os_timer = new os_Timer( setTimeout(
'os_delayedFetch()', timeout ), r, query );
} else {
os_timer = new os_Timer( null, r, query );
os_delayedFetch(); // do it now!
@@ -790,7 +790,7 @@
clearInterval( os_animation_timer.id );
}
os_animation_timer = new os_AnimationTimer( r, w );
- os_animation_timer.id = setInterval(
"os_animateChangeWidth()", os_animation_delay );
+ os_animation_timer.id = setInterval(
'os_animateChangeWidth()', os_animation_delay );
w -= fix; // this much is reserved
}
Modified:
branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.protect.js
===================================================================
--- branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.protect.js
2010-07-30 18:26:51 UTC (rev 70197)
+++ branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.protect.js
2010-07-30 18:33:19 UTC (rev 70198)
@@ -246,7 +246,7 @@
* @return Array
*/
'getLevelSelectors': function() {
- var all = document.getElementsByTagName("select");
+ var all = document.getElementsByTagName('select');
var ours = new Array();
for (var i = 0; i < all.length; i++) {
var element = all[i];
@@ -273,7 +273,7 @@
* @return Array
*/
'getExpiryInputs': function() {
- var all = document.getElementsByTagName("input");
+ var all = document.getElementsByTagName('input');
var ours = new Array();
for (var i = 0; i < all.length; i++) {
var element = all[i];
@@ -299,7 +299,7 @@
* @return Array
*/
'getExpirySelectors': function() {
- var all = document.getElementsByTagName("select");
+ var all = document.getElementsByTagName('select');
var ours = new Array();
for (var i = 0; i < all.length; i++) {
var element = all[i];
Modified:
branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.wikibits.js
===================================================================
--- branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.wikibits.js
2010-07-30 18:26:51 UTC (rev 70197)
+++ branches/resourceloader/phase3/resources/mw/legacy/mw.legacy.wikibits.js
2010-07-30 18:33:19 UTC (rev 70198)
@@ -273,7 +273,7 @@
var tip = element.getAttribute( 'title' );
if ( tip && mw.legacy.tooltipAccessKeyRegexp.exec( tip
) ) {
tip =
tip.replace(mw.legacy.tooltipAccessKeyRegexp,
- '[' +
mw.legacy.tooltipAccessKeyPrefix + "$5]");
+ '[' +
mw.legacy.tooltipAccessKeyPrefix + '$5]');
element.setAttribute( 'title', tip );
}
}
@@ -377,7 +377,7 @@
outerSpan.appendChild( document.createTextNode( ']' ) );
linkHolder.appendChild( document.createTextNode( ' ' )
);
linkHolder.appendChild( outerSpan );
- var cookiePos = document.cookie.indexOf( "hidetoc=" );
+ var cookiePos = document.cookie.indexOf( 'hidetoc=' );
if ( cookiePos > -1 && document.cookie.charAt(
cookiePos + 8 ) == 1 ) {
toggleToc();
}
@@ -391,12 +391,12 @@
if ( toc && toggleLink && toc.style.display == 'none' ) {
changeText( toggleLink, tocHideText );
toc.style.display = 'block';
- document.cookie = "hidetoc=0";
+ document.cookie = 'hidetoc=0';
tocmain.className = 'toc';
} else {
changeText( toggleLink, tocShowText );
toc.style.display = 'none';
- document.cookie = "hidetoc=1";
+ document.cookie = 'hidetoc=1';
tocmain.className = 'toc tochidden';
}
return false;
@@ -587,20 +587,20 @@
if ( typeof wgSeparatorTransformTable == 'undefined'
|| ( wgSeparatorTransformTable[0] == '' &&
wgDigitTransformTable[2] == '' ) )
{
- var digitClass = "[0-9,.]";
+ var digitClass = '[0-9,.]';
mw.legacy.ts_number_transform_table = false;
} else {
mw.legacy.ts_number_transform_table = {};
// Unpack the transform table
// Separators
- var ascii = wgSeparatorTransformTable[0].split("\t");
- var localised =
wgSeparatorTransformTable[1].split("\t");
+ var ascii = wgSeparatorTransformTable[0].split('\t');
+ var localised =
wgSeparatorTransformTable[1].split('\t');
for ( var i = 0; i < ascii.length; i++ ) {
mw.legacy.ts_number_transform_table[localised[i]] = ascii[i];
}
// Digits
- ascii = wgDigitTransformTable[0].split("\t");
- localised = wgDigitTransformTable[1].split("\t");
+ ascii = wgDigitTransformTable[0].split('\t');
+ localised = wgDigitTransformTable[1].split('\t');
for ( var i = 0; i < ascii.length; i++ ) {
mw.legacy.ts_number_transform_table[localised[i]] = ascii[i];
}
@@ -626,11 +626,11 @@
// We allow a trailing percent sign, which we just strip. This
works fine
// if percents and regular numbers aren't being mixed.
mw.legacy.ts_number_regex = new RegExp(
- "^(" +
-
"[-+\u2212]?[0-9][0-9,]*(\\.[0-9,]*)?(E[-+\u2212]?[0-9][0-9,]*)?" + //
Fortran-style scientific
- "|" +
- "[-+\u2212]?" + digitClass + "+%?" + // Generic
localised
- ")$", "i"
+ '^(' +
+
'[-+\u2212]?[0-9][0-9,]*(\\.[0-9,]*)?(E[-+\u2212]?[0-9][0-9,]*)?' + //
Fortran-style scientific
+ '|' +
+ '[-+\u2212]?' + digitClass + '+%?' + // Generic
localised
+ ')$', 'i'
);
},
'ts_toLowerCase': function( s ) {
@@ -717,7 +717,7 @@
}
s = newNum;
}
- var num = parseFloat( s.replace(/[, ]/g, '').replace("\u2212",
'-') );
+ var num = parseFloat( s.replace(/[, ]/g, '').replace('\u2212',
'-') );
return ( isNaN( num ) ? -Infinity : num );
},
'ts_currencyToSortKey': function( s ) {
@@ -764,21 +764,21 @@
}
},
'escapeQuotes': function( text ) {
- var re = new RegExp( "'", "g" );
- text = text.replace( re, "\\'" );
- re = new RegExp( "\\n", "g" );
- text = text.replace( re, "\\n" );
+ var re = new RegExp( '\'', 'g' );
+ text = text.replace( re, '\\'' );
+ re = new RegExp( '\\n', 'g' );
+ text = text.replace( re, '\\n' );
return escapeQuotesHTML( text );
},
'escapeQuotesHTML': function( text ) {
- var re = new RegExp( '&', "g" );
- text = text.replace( re, "&" );
- re = new RegExp( '"', "g" );
- text = text.replace( re, """ );
- re = new RegExp( '<', "g" );
- text = text.replace( re, "<" );
- re = new RegExp( '>', "g" );
- text = text.replace( re, ">" );
+ var re = new RegExp( '&', 'g' );
+ text = text.replace( re, '&' );
+ re = new RegExp( '\'', 'g' );
+ text = text.replace( re, '"' );
+ re = new RegExp( '<', 'g' );
+ text = text.replace( re, '<' );
+ re = new RegExp( '>', 'g' );
+ text = text.replace( re, '>' );
return text;
},
/**
@@ -837,7 +837,7 @@
return null;
}
// unhide portlet if it was hidden before
- root.className = root.className.replace( /(^| )emptyPortlet(
|$)/, "$2" );
+ root.className = root.className.replace( /(^| )emptyPortlet(
|$)/, '$2' );
var span = document.createElement( 'span' );
span.appendChild( document.createTextNode( text ) );
var link = document.createElement( 'a' );
@@ -1006,11 +1006,11 @@
if( typeof oClassNames == 'object' ) {
for( var i = 0; i < oClassNames.length; i++ ) {
arrRegExpClassNames[arrRegExpClassNames.length]
=
- new RegExp("(^|\\s)" +
oClassNames[i].replace(/\-/g, "\\-") + "(\\s|$)");
+ new RegExp('(^|\\s)' +
oClassNames[i].replace(/\-/g, '\\-') + '(\\s|$)');
}
} else {
arrRegExpClassNames[arrRegExpClassNames.length] =
- new RegExp("(^|\\s)" +
oClassNames.replace(/\-/g, "\\-") + "(\\s|$)");
+ new RegExp('(^|\\s)' +
oClassNames.replace(/\-/g, '\\-') + '(\\s|$)');
}
var oElement;
var bMatchesAll;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
