From: Krinkle Date: Fri, 12 Nov 2010 23:10:58 +0000 (+0000) Subject: clean-up trailing spaces and tabs in js/css resources X-Git-Tag: 1.31.0-rc.0~33909 X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=c563312d90c421a20ac678e091b6906a1f7e2e08;p=lhc%2Fweb%2Fwiklou.git clean-up trailing spaces and tabs in js/css resources --- diff --git a/resources/jquery/jquery.checkboxShiftClick.js b/resources/jquery/jquery.checkboxShiftClick.js index 7d106ec6d4..b0f96f0d6f 100644 --- a/resources/jquery/jquery.checkboxShiftClick.js +++ b/resources/jquery/jquery.checkboxShiftClick.js @@ -1,8 +1,8 @@ /** * jQuery checkboxShiftClick - * + * * This will enable checkboxes to be checked or unchecked in a row by clicking one, holding shift and clicking another one - * + * * @author Krinkle * @license GPL v2 */ diff --git a/resources/mediawiki.advanced/mediawiki.advanced.rightclickedit.js b/resources/mediawiki.advanced/mediawiki.advanced.rightclickedit.js index 29de20845b..1eb93d29c4 100644 --- a/resources/mediawiki.advanced/mediawiki.advanced.rightclickedit.js +++ b/resources/mediawiki.advanced/mediawiki.advanced.rightclickedit.js @@ -4,11 +4,11 @@ $( function() { // Select all h1-h6 elements that contain editsection links - $('h1:has(.editsection a), ' + - 'h2:has(.editsection a), ' + - 'h3:has(.editsection a), ' + - 'h4:has(.editsection a), ' + - 'h5:has(.editsection a), ' + + $('h1:has(.editsection a), ' + + 'h2:has(.editsection a), ' + + 'h3:has(.editsection a), ' + + 'h4:has(.editsection a), ' + + 'h5:has(.editsection a), ' + 'h6:has(.editsection a)' ).live( 'contextmenu', function( e ) { // Get href of the [edit] link diff --git a/resources/mediawiki.language/mediawiki.language.js b/resources/mediawiki.language/mediawiki.language.js index aa4183b5f0..f65385239b 100644 --- a/resources/mediawiki.language/mediawiki.language.js +++ b/resources/mediawiki.language/mediawiki.language.js @@ -1,16 +1,16 @@ /** * Base language object - * - * Localized Language support attempts to mirror some of the functionality of - * Language.php in MediaWiki. This object contains methods for loading and + * + * Localized Language support attempts to mirror some of the functionality of + * Language.php in MediaWiki. This object contains methods for loading and * transforming message text. */ mediaWiki.language = { /** - * Process the PLURAL template substitution - * - * @param {object} template Template object + * Process the PLURAL template substitution + * + * @param {object} template Template object * @format template * { * 'title': [title of template], @@ -26,7 +26,7 @@ mediaWiki.language = { } // Restore the count into a Number ( if it got converted earlier ) var count = mediaWiki.language.convertNumber( template.title, true ); - // Do convertPlural call + // Do convertPlural call return mediaWiki.language.convertPlural( parseInt( count ), template.parameters ); } // Could not process plural return first form or nothing @@ -37,20 +37,20 @@ mediaWiki.language = { }, /** * Plural form transformations, needed for some languages. - * + * * @param {integer} count Non-localized quantifier * @param {array} forms List of plural forms * @return {string} Correct form for quantifier in this language */ 'convertPlural': function( count, forms ){ if ( !forms || forms.length == 0 ) { - return ''; + return ''; } return ( parseInt( count ) == 1 ) ? forms[0] : forms[1]; }, /** * Pads an array to a specific length by copying the last one element. - * + * * @param {array} forms Number of forms given to convertPlural * @param {integer} count Number of forms required * @return {array} Padded array of forms @@ -58,12 +58,12 @@ mediaWiki.language = { 'preConvertPlural': function( forms, count ) { while ( forms.length < count ) { forms.push( forms[ forms.length-1 ] ); - } + } return forms; }, /** * Converts a number using digitTransformTable. - * + * * @param {number} number Value to be converted * @param {boolean} integer Convert the return value to an integer */ @@ -71,7 +71,7 @@ mediaWiki.language = { if ( !mediaWiki.language.digitTransformTable ) { return number; } - // Set the target Transform table: + // Set the target Transform table: var transformTable = mediaWiki.language.digitTransformTable; // Check if the "restore" to Latin number flag is set: if ( integer ) { diff --git a/resources/mediawiki.specials/mediawiki.specials.preferences.css b/resources/mediawiki.specials/mediawiki.specials.preferences.css index 5f5b3c2451..b6298a5749 100644 --- a/resources/mediawiki.specials/mediawiki.specials.preferences.css +++ b/resources/mediawiki.specials/mediawiki.specials.preferences.css @@ -1,5 +1,5 @@ #mw-emailaddress-validity { - padding: 2px 1em; + padding: 2px 1em; } body.ltr #mw-emailaddress-validity { border-bottom-right-radius:0.8em; diff --git a/resources/mediawiki.specials/mediawiki.specials.preferences.js b/resources/mediawiki.specials/mediawiki.specials.preferences.js index 4663a42101..5df2a3c916 100644 --- a/resources/mediawiki.specials/mediawiki.specials.preferences.js +++ b/resources/mediawiki.specials/mediawiki.specials.preferences.js @@ -88,9 +88,9 @@ wfValidateEmail = function( mailtxt ) { "`" / "{" / "|" / "}" / "~" - */ + */ var rfc5322_atext = "a-z0-9!#$%&'*+-/=?^_`{|}—~" ; - + /** * Next define the RFC 1034 'ldh-str' * ::= | " " @@ -112,7 +112,7 @@ wfValidateEmail = function( mailtxt ) { // "apostrophe" '@' + - // Domain first part + // Domain first part '[' + rfc1034_ldh_str + ']+' + // Second part and following are separated by a dot diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js index 55754e222f..6e285ace51 100644 --- a/resources/mediawiki/mediawiki.js +++ b/resources/mediawiki/mediawiki.js @@ -21,7 +21,7 @@ jQuery.extend({ return false; } for ( var i = 0; i < arrThis.length; i++ ) { - if ( arrThis[i] instanceof Array ) { + if ( arrThis[i] instanceof Array ) { if ( !$.compareArray( arrThis[i], arrAgainst[i] ) ) { return false; } @@ -39,35 +39,35 @@ jQuery.extend({ // Attach to window window.mediaWiki = new ( function( $ ) { - + /* Constants */ - + // This will not change until we are 100% ready to turn off legacy globals var LEGACY_GLOBALS = true; - + /* Private Members */ - + // List of messages that have been requested to be loaded var messageQueue = {}; - + /* Prototypes */ - + /** - * An object which allows single and multiple get/set/exists functionality + * An object which allows single and multiple get/set/exists functionality * on a list of key / value pairs. - * - * @param {boolean} global Whether to get/set/exists values on the window + * + * @param {boolean} global Whether to get/set/exists values on the window * object or a private object */ function Map( global ) { this.values = ( global === true ) ? window : {}; }; - + /** * Gets the value of a key, or a list of key/value pairs for an array of keys. - * + * * If called with no arguments, all values will be returned. - * + * * @param {mixed} selection Key or array of keys to get values for * @param {mixed} fallback Value to use in case key(s) do not exist (optional) */ @@ -90,10 +90,10 @@ window.mediaWiki = new ( function( $ ) { } return this.values; }; - + /** * Sets one or multiple key/value pairs. - * + * * @param {mixed} selection Key or object of key/value pairs to set * @param {mixed} value Value to set (optional, only in use when key is a string) */ @@ -106,10 +106,10 @@ window.mediaWiki = new ( function( $ ) { this.values[selection] = value; } }; - + /** * Checks if one or multiple keys exist. - * + * * @param {mixed} key Key or array of keys to check * @return {boolean} Existence of key(s) */ @@ -125,9 +125,9 @@ window.mediaWiki = new ( function( $ ) { return selection in this.values; } }; - + /** - * Message object, similar to Message in PHP + * Message object, similar to Message in PHP */ function Message( map, key, parameters ) { this.format = 'parse'; @@ -135,10 +135,10 @@ window.mediaWiki = new ( function( $ ) { this.key = key; this.parameters = typeof parameters === 'undefined' ? [] : $.makeArray( parameters ); }; - + /** * Appends parameters for replacement - * + * * @param {mixed} args First in a list of variadic arguments to append as message parameters */ Message.prototype.params = function( parameters ) { @@ -147,10 +147,10 @@ window.mediaWiki = new ( function( $ ) { } return this; }; - + /** * Converts message object to it's string form based on the state of format - * + * * @return {string} String form of message */ Message.prototype.toString = function() { @@ -171,47 +171,47 @@ window.mediaWiki = new ( function( $ ) { */ return text; }; - + /** * Changes format to parse and converts message to string - * + * * @return {string} String form of parsed message */ Message.prototype.parse = function() { this.format = 'parse'; return this.toString(); }; - + /** * Changes format to plain and converts message to string - * + * * @return {string} String form of plain message */ Message.prototype.plain = function() { this.format = 'plain'; return this.toString(); }; - + /** * Checks if message exists - * + * * @return {string} String form of parsed message */ Message.prototype.exists = function() { return this.map.exists( this.key ); }; - + /** * User object */ function User() { this.options = new Map(); } - + /* Public Members */ /* - * Dummy function which in debug mode can be replaced with a function that + * Dummy function which in debug mode can be replaced with a function that * does something clever */ this.log = function() { }; @@ -227,17 +227,17 @@ window.mediaWiki = new ( function( $ ) { * Information about the current user */ this.user = new User(); - + /* * Localization system */ this.messages = new Map(); - + /* Public Methods */ - + /** * Gets a message object, similar to wfMessage() - * + * * @param {string} key Key of message to get * @param {mixed} params First argument in a list of variadic arguments, each a parameter for $ * replacement @@ -252,10 +252,10 @@ window.mediaWiki = new ( function( $ ) { } return new Message( mediaWiki.messages, key, parameters ); }; - + /** * Gets a message string, similar to wfMsg() - * + * * @param {string} key Key of message to get * @param {mixed} params First argument in a list of variadic arguments, each a parameter for $ * replacement @@ -263,21 +263,21 @@ window.mediaWiki = new ( function( $ ) { this.msg = function( key, parameters ) { return mediaWiki.message.apply( mediaWiki.message, arguments ).toString(); }; - + /** * Client-side module loader which integrates with the MediaWiki ResourceLoader */ this.loader = new ( function() { /* Private Members */ - + /** * Mapping of registered modules * - * The jquery module is pre-registered, because it must have already - * been provided for this object to have been built, and in debug mode - * jquery would have been provided through a unique loader request, - * making it impossible to hold back registration of jquery until after + * The jquery module is pre-registered, because it must have already + * been provided for this object to have been built, and in debug mode + * jquery would have been provided through a unique loader request, + * making it impossible to hold back registration of jquery until after * mediawiki. * * Format: @@ -311,7 +311,7 @@ window.mediaWiki = new ( function( $ ) { return false; } for ( var i = 0; i < b.length; i++ ) { - if ( $.isArray( a[i] ) ) { + if ( $.isArray( a[i] ) ) { if ( !compare( a[i], b[i] ) ) { return false; } @@ -322,7 +322,7 @@ window.mediaWiki = new ( function( $ ) { } return true; }; - + /** * Generates an ISO8601 "basic" string from a UNIX timestamp */ @@ -358,7 +358,7 @@ window.mediaWiki = new ( function( $ ) { if ( $.inArray( registry[module].dependencies[n], resolved ) === -1 ) { if ( $.inArray( registry[module].dependencies[n], unresolved ) !== -1 ) { throw new Error( - 'Circular reference detected: ' + module + + 'Circular reference detected: ' + module + ' -> ' + registry[module].dependencies[n] ); } @@ -400,12 +400,12 @@ window.mediaWiki = new ( function( $ ) { }; /** - * Narrows a list of module names down to those matching a specific - * state. Possible states are 'undefined', 'registered', 'loading', + * Narrows a list of module names down to those matching a specific + * state. Possible states are 'undefined', 'registered', 'loading', * 'loaded', or 'ready' * * @param mixed string or array of strings of module states to filter by - * @param array list of module names to filter (optional, all modules + * @param array list of module names to filter (optional, all modules * will be used by default) * @return array list of filtered module names */ @@ -465,11 +465,11 @@ window.mediaWiki = new ( function( $ ) { { type: "text/css" }, new mediaWiki.html.Cdata( registry[module].style ) ) ); - } else if ( typeof registry[module].style === 'object' - && !( registry[module].style instanceof Array ) ) + } else if ( typeof registry[module].style === 'object' + && !( registry[module].style instanceof Array ) ) { for ( var media in registry[module].style ) { - $( 'head' ).append( mediaWiki.html.element( 'style', + $( 'head' ).append( mediaWiki.html.element( 'style', { type: 'text/css', media: media }, new mediaWiki.html.Cdata( registry[module].style[media] ) ) ); @@ -486,8 +486,8 @@ window.mediaWiki = new ( function( $ ) { // Run jobs who's dependencies have just been met for ( var j = 0; j < jobs.length; j++ ) { if ( compare( - filter( 'ready', jobs[j].dependencies ), - jobs[j].dependencies ) ) + filter( 'ready', jobs[j].dependencies ), + jobs[j].dependencies ) ) { if ( typeof jobs[j].ready === 'function' ) { jobs[j].ready(); @@ -499,9 +499,9 @@ window.mediaWiki = new ( function( $ ) { // Execute modules who's dependencies have just been met for ( r in registry ) { if ( registry[r].state == 'loaded' ) { - if ( compare( - filter( ['ready'], registry[r].dependencies ), - registry[r].dependencies ) ) + if ( compare( + filter( ['ready'], registry[r].dependencies ), + registry[r].dependencies ) ) { execute( r ); } @@ -525,7 +525,7 @@ window.mediaWiki = new ( function( $ ) { } /** - * Adds a dependencies to the queue with optional callbacks to be run + * Adds a dependencies to the queue with optional callbacks to be run * when the dependencies are ready or fail * * @param mixed string moulde name or array of string module names @@ -538,7 +538,7 @@ window.mediaWiki = new ( function( $ ) { dependencies = [dependencies]; if ( dependencies[0] in registry ) { for ( var n = 0; n < registry[dependencies[0]].dependencies.length; n++ ) { - dependencies[dependencies.length] = + dependencies[dependencies.length] = registry[dependencies[0]].dependencies[n]; } } @@ -546,8 +546,8 @@ window.mediaWiki = new ( function( $ ) { // Add ready and error callbacks if they were given if ( arguments.length > 1 ) { jobs[jobs.length] = { - 'dependencies': filter( - ['undefined', 'registered', 'loading', 'loaded'], + 'dependencies': filter( + ['undefined', 'registered', 'loading', 'loaded'], dependencies ), 'ready': ready, 'error': error @@ -602,7 +602,7 @@ window.mediaWiki = new ( function( $ ) { queue = []; // After document ready, handle the batch if ( !suspended && batch.length ) { - // Always order modules alphabetically to help reduce cache + // Always order modules alphabetically to help reduce cache // misses for otherwise identical content batch.sort(); // Build a list of request parameters @@ -634,10 +634,10 @@ window.mediaWiki = new ( function( $ ) { { 'modules': groups[group].join( '|' ), 'version': formatVersionNumber( version ) }, base ); } - // Clear the batch - this MUST happen before we append the - // script element to the body or it's possible that the script - // will be locally cached, instantly load, and work the batch - // again, all before we've cleared it causing each request to + // Clear the batch - this MUST happen before we append the + // script element to the body or it's possible that the script + // will be locally cached, instantly load, and work the batch + // again, all before we've cleared it causing each request to // include modules which are already loaded batch = []; // Asynchronously append a script tag to the end of the body @@ -647,7 +647,7 @@ window.mediaWiki = new ( function( $ ) { requests[r] = sortQuery( requests[r] ); // Build out the HTML var src = mediaWiki.config.get( 'wgLoadScript' ) + '?' + $.param( requests[r] ); - html += mediaWiki.html.element( 'script', + html += mediaWiki.html.element( 'script', { type: 'text/javascript', src: src }, '' ); } return html; @@ -662,7 +662,7 @@ window.mediaWiki = new ( function( $ ) { }; /** - * Registers a module, letting the system know about it and its + * Registers a module, letting the system know about it and its * dependencies. loader.js files contain calls to this function. */ this.register = function( module, version, dependencies, group ) { @@ -695,15 +695,15 @@ window.mediaWiki = new ( function( $ ) { // Allow dependencies to be given as a single module name registry[module].dependencies = [dependencies]; } else if ( typeof dependencies === 'object' || typeof dependencies === 'function' ) { - // Allow dependencies to be given as an array of module names + // Allow dependencies to be given as an array of module names // or a function which returns an array registry[module].dependencies = dependencies; } }; /** - * Implements a module, giving the system a course of action to take - * upon loading. Results of a request for one or more modules contain + * Implements a module, giving the system a course of action to take + * upon loading. Results of a request for one or more modules contain * calls to this function. */ this.implement = function( module, script, style, localization ) { @@ -715,19 +715,19 @@ window.mediaWiki = new ( function( $ ) { if ( typeof script !== 'function' ) { throw new Error( 'script must be a function, not a ' + typeof script ); } - if ( typeof style !== 'undefined' - && typeof style !== 'string' - && typeof style !== 'object' ) + if ( typeof style !== 'undefined' + && typeof style !== 'string' + && typeof style !== 'object' ) { throw new Error( 'style must be a string or object, not a ' + typeof style ); } - if ( typeof localization !== 'undefined' - && typeof localization !== 'object' ) + if ( typeof localization !== 'undefined' + && typeof localization !== 'object' ) { throw new Error( 'localization must be an object, not a ' + typeof localization ); } - if ( typeof registry[module] !== 'undefined' - && typeof registry[module].script !== 'undefined' ) + if ( typeof registry[module] !== 'undefined' + && typeof registry[module].script !== 'undefined' ) { throw new Error( 'module already implemeneted: ' + module ); } @@ -735,8 +735,8 @@ window.mediaWiki = new ( function( $ ) { registry[module].state = 'loaded'; // Attach components registry[module].script = script; - if ( typeof style === 'string' - || typeof style === 'object' && !( style instanceof Array ) ) + if ( typeof style === 'string' + || typeof style === 'object' && !( style instanceof Array ) ) { registry[module].style = style; } @@ -744,9 +744,9 @@ window.mediaWiki = new ( function( $ ) { registry[module].messages = localization; } // Execute or queue callback - if ( compare( - filter( ['ready'], registry[module].dependencies ), - registry[module].dependencies ) ) + if ( compare( + filter( ['ready'], registry[module].dependencies ), + registry[module].dependencies ) ) { execute( module ); } else { @@ -757,7 +757,7 @@ window.mediaWiki = new ( function( $ ) { /** * Executes a function as soon as one or more required modules are ready * - * @param mixed string or array of strings of modules names the callback + * @param mixed string or array of strings of modules names the callback * dependencies to be ready before * executing * @param function callback to execute when all dependencies are ready (optional) @@ -766,7 +766,7 @@ window.mediaWiki = new ( function( $ ) { this.using = function( dependencies, ready, error ) { // Validate input if ( typeof dependencies !== 'object' && typeof dependencies !== 'string' ) { - throw new Error( 'dependencies must be a string or an array, not a ' + + throw new Error( 'dependencies must be a string or an array, not a ' + typeof dependencies ) } // Allow calling with a single dependency as a string @@ -796,24 +796,24 @@ window.mediaWiki = new ( function( $ ) { /** * Loads an external script or one or more modules for future use * - * @param {mixed} modules either the name of a module, array of modules, + * @param {mixed} modules either the name of a module, array of modules, * or a URL of an external script or style - * @param {string} type mime-type to use if calling with a URL of an - * external script or style; acceptable values are "text/css" and - * "text/javascript"; if no type is provided, text/javascript is + * @param {string} type mime-type to use if calling with a URL of an + * external script or style; acceptable values are "text/css" and + * "text/javascript"; if no type is provided, text/javascript is * assumed */ this.load = function( modules, type ) { // Validate input if ( typeof modules !== 'object' && typeof modules !== 'string' ) { - throw new Error( 'dependencies must be a string or an array, not a ' + + throw new Error( 'dependencies must be a string or an array, not a ' + typeof dependencies ) } // Allow calling with an external script or single dependency as a string if ( typeof modules === 'string' ) { // Support adding arbitrary external scripts - if ( modules.substr( 0, 7 ) == 'http://' - || modules.substr( 0, 8 ) == 'https://' ) + if ( modules.substr( 0, 7 ) == 'http://' + || modules.substr( 0, 8 ) == 'https://' ) { if ( type === 'text/css' ) { $( 'head' ) @@ -821,7 +821,7 @@ window.mediaWiki = new ( function( $ ) { .attr( 'href', modules ) ); return true; } else if ( type === 'text/javascript' || typeof type === 'undefined' ) { - var script = mediaWiki.html.element( 'script', + var script = mediaWiki.html.element( 'script', { type: 'text/javascript', src: modules }, '' ); if ( ready ) { $( 'body' ).append( script ); @@ -923,7 +923,7 @@ window.mediaWiki = new ( function( $ ) { }; /** - * Wrapper object for raw HTML passed to mediaWiki.html.element(). + * Wrapper object for raw HTML passed to mediaWiki.html.element(). */ this.Raw = function( value ) { this.value = value; @@ -945,13 +945,13 @@ window.mediaWiki = new ( function( $ ) { * - string: The string is escaped. * - null or undefined: The short closing form is used, e.g.
. * - this.Raw: The value attribute is included without escaping. - * - this.Cdata: The value attribute is included, and an exception is - * thrown if it contains an illegal ETAGO delimiter. + * - this.Cdata: The value attribute is included, and an exception is + * thrown if it contains an illegal ETAGO delimiter. * See http://www.w3.org/TR/1999/REC-html401-19991224/appendix/notes.html#h-B.3.2 * * Example: * var h = mediaWiki.html; - * return h.element( 'div', {}, + * return h.element( 'div', {}, * new h.Raw( h.element( 'img', {src: '<'} ) ) ); * Returns
*/ diff --git a/resources/mediawiki/mediawiki.log.js b/resources/mediawiki/mediawiki.log.js index 09123cfa6a..15b73d04de 100644 --- a/resources/mediawiki/mediawiki.log.js +++ b/resources/mediawiki/mediawiki.log.js @@ -6,7 +6,7 @@ /** * Log output to the console. - * + * * In the case that the browser does not have a console available, one is created by appending a *
element to the bottom of the body and then appending a
element to that for each * message. @@ -16,9 +16,9 @@ * @param {string} string Message to output to console */ mediaWiki.log = function( string ) { - // Allow log messages to use a configured prefix + // Allow log messages to use a configured prefix if ( mw.config.exists( 'mw.log.prefix' ) ) { - string = mw.config.get( 'mw.log.prefix' ) + '> ' + string; + string = mw.config.get( 'mw.log.prefix' ) + '> ' + string; } // Try to use an existing console if ( typeof window.console !== 'undefined' && typeof window.console.log == 'function' ) {