whitespace commit (removing trailing space)
This commit is contained in:
parent
fcf8776068
commit
836dbd7bfd
8 changed files with 68 additions and 68 deletions
|
|
@ -1685,14 +1685,14 @@ if( count( $errs ) ) {
|
|||
</div>
|
||||
</fieldset>
|
||||
|
||||
|
||||
|
||||
<?php database_switcher($ourdb, 'mssql' ); ?>
|
||||
<div class="config-desc">
|
||||
<p>No MS SQL Server specific options at this time.</p>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
|
||||
|
||||
|
||||
<?php database_switcher($ourdb, 'ibm_db2'); ?>
|
||||
<div class="config-input"><?php
|
||||
aField( $conf, "DBport_db2", "Database port:" );
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ class WebInstaller extends CoreInstaller {
|
|||
$this->exportVars();
|
||||
$this->setupLanguage();
|
||||
|
||||
if( ( $this->getVar( '_InstallDone' ) || $this->getVar( '_UpgradeDone' ) )
|
||||
if( ( $this->getVar( '_InstallDone' ) || $this->getVar( '_UpgradeDone' ) )
|
||||
&& $this->request->getVal( 'localsettings' ) )
|
||||
{
|
||||
$this->request->response()->header( 'Content-type: text/plain' );
|
||||
|
|
@ -620,7 +620,7 @@ class WebInstaller extends CoreInstaller {
|
|||
" title=\"" . $html . "\"\n" .
|
||||
" original-title=\"" . $html . "\"></span>\n";
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Output a help box.
|
||||
*/
|
||||
|
|
@ -687,7 +687,7 @@ class WebInstaller extends CoreInstaller {
|
|||
" </div>\n" .
|
||||
"</div>\n";
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get a labelled text box to configure a variable.
|
||||
*
|
||||
|
|
@ -732,7 +732,7 @@ class WebInstaller extends CoreInstaller {
|
|||
$params['help']
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get a labelled password box to configure a variable.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@
|
|||
return array(
|
||||
|
||||
/* Special resources who have their own classes */
|
||||
|
||||
|
||||
'site' => array( 'class' => 'ResourceLoaderSiteModule' ),
|
||||
'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
|
||||
'user' => array( 'class' => 'ResourceLoaderUserModule' ),
|
||||
'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
|
||||
|
||||
|
||||
/* Skins */
|
||||
|
||||
'skins.vector' => array(
|
||||
|
||||
'skins.vector' => array(
|
||||
'styles' => array( 'skins/vector/screen.css' => array( 'media' => 'screen' ) )
|
||||
),
|
||||
'skins.monobook' => array(
|
||||
|
|
@ -21,20 +21,20 @@ return array(
|
|||
//$GLOBALS['wgHandheldStyle'] => array( 'media' => 'handheld' )
|
||||
)
|
||||
),
|
||||
|
||||
|
||||
/* jQuery */
|
||||
|
||||
|
||||
'jquery' => array(
|
||||
'scripts' => 'resources/jquery/jquery.js',
|
||||
'scripts' => 'resources/jquery/jquery.js',
|
||||
'debugRaw' => false
|
||||
),
|
||||
|
||||
|
||||
/* jQuery Plugins */
|
||||
|
||||
'jquery.async' => array(
|
||||
|
||||
'jquery.async' => array(
|
||||
'scripts' => 'resources/jquery/jquery.async.js'
|
||||
),
|
||||
'jquery.autoEllipsis' => array(
|
||||
'jquery.autoEllipsis' => array(
|
||||
'scripts' => 'resources/jquery/jquery.autoEllipsis.js'
|
||||
),
|
||||
'jquery.checkboxShiftClick' => array(
|
||||
|
|
@ -78,9 +78,9 @@ return array(
|
|||
'scripts' => 'resources/jquery.tipsy/jquery.tipsy.js',
|
||||
'styles' => 'resources/jquery.tipsy/jquery.tipsy.css',
|
||||
),
|
||||
|
||||
|
||||
/* jQuery UI */
|
||||
|
||||
|
||||
// Core
|
||||
'jquery.ui.core' => array(
|
||||
'scripts' => 'resources/jquery.ui/jquery.ui.core.js',
|
||||
|
|
@ -113,8 +113,8 @@ return array(
|
|||
),
|
||||
'jquery.ui.droppable' => array(
|
||||
'scripts' => 'resources/jquery.ui/jquery.ui.droppable.js',
|
||||
'dependencies' => array(
|
||||
'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget', 'jquery.ui.draggable'
|
||||
'dependencies' => array(
|
||||
'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget', 'jquery.ui.draggable'
|
||||
),
|
||||
),
|
||||
'jquery.ui.resizable' => array(
|
||||
|
|
@ -317,9 +317,9 @@ return array(
|
|||
'scripts' => 'resources/jquery.effects/jquery.effects.transfer.js',
|
||||
'dependencies' => 'jquery.effects.core',
|
||||
),
|
||||
|
||||
|
||||
/* MediaWiki */
|
||||
|
||||
|
||||
'mediawiki' => array(
|
||||
'scripts' => 'resources/mediawiki/mediawiki.js',
|
||||
'debugScripts' => 'resources/mediawiki/mediawiki.log.js',
|
||||
|
|
@ -394,14 +394,14 @@ return array(
|
|||
'wa' => 'resources/mediawiki.language/languages/wa.js',
|
||||
),
|
||||
),
|
||||
|
||||
|
||||
/* mediawiki Legacy */
|
||||
|
||||
|
||||
'mediawiki.legacy.ajax' => array(
|
||||
'scripts' => 'skins/common/ajax.js',
|
||||
'messages' => array(
|
||||
'watch', 'unwatch', 'watching', 'unwatching', 'tooltip-ca-watch',
|
||||
'tooltip-ca-unwatch'
|
||||
'messages' => array(
|
||||
'watch', 'unwatch', 'watching', 'unwatching', 'tooltip-ca-watch',
|
||||
'tooltip-ca-unwatch'
|
||||
),
|
||||
'dependencies' => 'mediawiki.legacy.wikibits',
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/**
|
||||
* HTML5 placeholder emulation for jQuery plugin
|
||||
*
|
||||
*
|
||||
* This will automatically use the HTML5 placeholder attribute if supported, or emulate this behavior if not.
|
||||
*
|
||||
*
|
||||
* @author Trevor Parscal <tparscal@wikimedia.org>
|
||||
* @author Krinkle <krinklemail@gmail.com>
|
||||
* @version 0.2.0
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -27,17 +27,17 @@
|
|||
// Chrome on any platform
|
||||
} else if ( profile.name == 'chrome' ) {
|
||||
// Chrome on Mac or Chrome on other platform ?
|
||||
mw.util.tooltipAccessKeyPrefix = ( profile.platform == 'mac'
|
||||
mw.util.tooltipAccessKeyPrefix = ( profile.platform == 'mac'
|
||||
? 'ctrl-option-' : 'alt-' );
|
||||
|
||||
// Non-Windows Safari with webkit_version > 526
|
||||
} else if ( profile.platform !== 'win'
|
||||
&& profile.name == 'safari'
|
||||
&& profile.layoutVersion > 526 )
|
||||
} else if ( profile.platform !== 'win'
|
||||
&& profile.name == 'safari'
|
||||
&& profile.layoutVersion > 526 )
|
||||
{
|
||||
mw.util.tooltipAccessKeyPrefix = 'ctrl-alt-';
|
||||
|
||||
// Safari/Konqueror on any platform, or any browser on Mac
|
||||
// Safari/Konqueror on any platform, or any browser on Mac
|
||||
// (but not Safari on Windows)
|
||||
} else if ( !( profile.platform == 'win' && profile.name == 'safari' )
|
||||
&& ( profile.name == 'safari'
|
||||
|
|
@ -128,16 +128,16 @@
|
|||
},
|
||||
|
||||
/**
|
||||
* Check is a variable is empty. Supports strings, booleans, arrays and
|
||||
* objects. The string "0" is considered empty. A string containing only
|
||||
* Check is a variable is empty. Supports strings, booleans, arrays and
|
||||
* objects. The string "0" is considered empty. A string containing only
|
||||
* whitespace (ie. " ") is considered not empty.
|
||||
*
|
||||
* @param v The variable to check for emptyness
|
||||
*/
|
||||
'isEmpty' : function( v ) {
|
||||
var key;
|
||||
if ( v === "" || v === 0 || v === "0" || v === null
|
||||
|| v === false || typeof v === 'undefined' )
|
||||
if ( v === "" || v === 0 || v === "0" || v === null
|
||||
|| v === false || typeof v === 'undefined' )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
'getParamValue' : function( param, url ) {
|
||||
url = url ? url : document.location.href;
|
||||
// Get last match, stop at hash
|
||||
var re = new RegExp( '[^#]*[&?]' + $.escapeRE( param ) + '=([^&#]*)' );
|
||||
var re = new RegExp( '[^#]*[&?]' + $.escapeRE( param ) + '=([^&#]*)' );
|
||||
var m = re.exec( url );
|
||||
if ( m && m.length > 1 ) {
|
||||
return decodeURIComponent( m[1] );
|
||||
|
|
@ -173,7 +173,7 @@
|
|||
},
|
||||
|
||||
// Access key prefix.
|
||||
// Will be re-defined based on browser/operating system detection in
|
||||
// Will be re-defined based on browser/operating system detection in
|
||||
// mw.util.init().
|
||||
'tooltipAccessKeyPrefix' : 'alt-',
|
||||
|
||||
|
|
@ -195,9 +195,9 @@
|
|||
} else if ( nodeList ) {
|
||||
$nodes = $(nodeList);
|
||||
} else {
|
||||
// Rather than scanning all links, just the elements that
|
||||
// Rather than scanning all links, just the elements that
|
||||
// contain the relevant links
|
||||
this.updateTooltipAccessKeys(
|
||||
this.updateTooltipAccessKeys(
|
||||
$('#column-one a, #mw-head a, #mw-panel a, #p-logo a') );
|
||||
|
||||
// these are rare enough that no such optimization is needed
|
||||
|
|
@ -209,7 +209,7 @@
|
|||
$nodes.each( function ( i ) {
|
||||
var tip = $(this).attr( 'title' );
|
||||
if ( !!tip && mw.util.tooltipAccessKeyRegexp.exec( tip ) ) {
|
||||
tip = tip.replace( mw.util.tooltipAccessKeyRegexp,
|
||||
tip = tip.replace( mw.util.tooltipAccessKeyRegexp,
|
||||
'[' + mw.util.tooltipAccessKeyPrefix + "$5]" );
|
||||
$(this).attr( 'title', tip );
|
||||
}
|
||||
|
|
@ -223,37 +223,37 @@
|
|||
/**
|
||||
* Add a link to a portlet menu on the page, such as:
|
||||
*
|
||||
* p-cactions (Content actions), p-personal (Personal tools),
|
||||
* p-cactions (Content actions), p-personal (Personal tools),
|
||||
* p-navigation (Navigation), p-tb (Toolbox)
|
||||
*
|
||||
* The first three paramters are required, others are optionals. Though
|
||||
* providing an id and tooltip is recommended.
|
||||
*
|
||||
* By default the new link will be added to the end of the list. To
|
||||
* add the link before a given existing item, pass the DOM node
|
||||
* (document.getElementById('foobar')) or the jQuery-selector
|
||||
* By default the new link will be added to the end of the list. To
|
||||
* add the link before a given existing item, pass the DOM node
|
||||
* (document.getElementById('foobar')) or the jQuery-selector
|
||||
* ('#foobar') of that item.
|
||||
*
|
||||
* @example mw.util.addPortletLink(
|
||||
* 'p-tb', 'http://mediawiki.org/',
|
||||
* 'p-tb', 'http://mediawiki.org/',
|
||||
* 'MediaWiki.org', 't-mworg', 'Go to MediaWiki.org ', 'm', '#t-print'
|
||||
* )
|
||||
*
|
||||
* @param portlet ID of the target portlet ('p-cactions' or 'p-personal' etc.)
|
||||
* @param href Link URL
|
||||
* @param text Link text (will be automatically converted to lower
|
||||
* @param text Link text (will be automatically converted to lower
|
||||
* case by CSS for p-cactions in Monobook)
|
||||
* @param id ID of the new item, should be unique and preferably have
|
||||
* @param id ID of the new item, should be unique and preferably have
|
||||
* the appropriate prefix ('ca-', 'pt-', 'n-' or 't-')
|
||||
* @param tooltip Text to show when hovering over the link, without accesskey suffix
|
||||
* @param accesskey Access key to activate this link (one character, try
|
||||
* to avoid conflicts. Use $('[accesskey=x').get() in the console to
|
||||
* @param accesskey Access key to activate this link (one character, try
|
||||
* to avoid conflicts. Use $('[accesskey=x').get() in the console to
|
||||
* see if 'x' is already used.
|
||||
* @param nextnode DOM node or jQuery-selector of the item that the new
|
||||
* item should be added before, should be another item in the same
|
||||
* @param nextnode DOM node or jQuery-selector of the item that the new
|
||||
* item should be added before, should be another item in the same
|
||||
* list will be ignored if not the so
|
||||
*
|
||||
* @return The DOM node of the new item (a LI element, or A element for
|
||||
* @return The DOM node of the new item (a LI element, or A element for
|
||||
* older skins) or null.
|
||||
*/
|
||||
'addPortletLink' : function( portlet, href, text, id, tooltip, accesskey, nextnode ) {
|
||||
|
|
@ -291,7 +291,7 @@
|
|||
if ($portlet.find( 'div' ).length === 0) {
|
||||
$portlet.append( '<ul/>' );
|
||||
} else {
|
||||
// otherwise if there's a div (such as div.body or div.pBody)
|
||||
// otherwise if there's a div (such as div.body or div.pBody)
|
||||
// append the <ul> to last (most likely only) div
|
||||
$portlet.find( 'div' ).eq( -1 ).append( '<ul/>' );
|
||||
}
|
||||
|
|
@ -329,7 +329,7 @@
|
|||
if ( nextnode && nextnode.parentNode == $ul.get( 0 ) ) {
|
||||
$(nextnode).before( $item );
|
||||
} else {
|
||||
// If the jQuery selector isn't found within the <ul>, just
|
||||
// If the jQuery selector isn't found within the <ul>, just
|
||||
// append it at the end
|
||||
if ( $ul.find( nextnode ).length === 0 ) {
|
||||
$ul.append( $item );
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
/**
|
||||
* This script provides a function which is run to evaluate whether or not to
|
||||
* continue loading the jquery and mediawiki modules. This code should work on
|
||||
* This script provides a function which is run to evaluate whether or not to
|
||||
* continue loading the jquery and mediawiki modules. This code should work on
|
||||
* even the most ancient of browsers, so be very careful when editing.
|
||||
*/
|
||||
/**
|
||||
* Returns false when run in a black-listed browser
|
||||
*
|
||||
* This function will be deleted after it's used, so do not expand it to be
|
||||
*
|
||||
* This function will be deleted after it's used, so do not expand it to be
|
||||
* generally useful beyond startup
|
||||
*
|
||||
*
|
||||
* jQuery has minimum requirements of:
|
||||
* * Firefox 2.0+
|
||||
* * Internet Explorer 6+
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
var isCompatible = function() {
|
||||
// IE < 6
|
||||
if ( navigator.appVersion.indexOf( 'MSIE' ) !== -1
|
||||
if ( navigator.appVersion.indexOf( 'MSIE' ) !== -1
|
||||
&& parseFloat( navigator.appVersion.split( 'MSIE' )[1] ) < 6 )
|
||||
{
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
.config-block {
|
||||
margin-top: 2em;
|
||||
display: block;
|
||||
|
||||
|
||||
}
|
||||
.config-block-label {
|
||||
display: block;
|
||||
|
|
@ -142,7 +142,7 @@
|
|||
.config-cc-wrapper {
|
||||
clear: left;
|
||||
/* If you change this height, also change it in WebInstaller_Options::submitCC() */
|
||||
height: 54em;
|
||||
height: 54em;
|
||||
}
|
||||
|
||||
.config-plainlink a {
|
||||
|
|
|
|||
Loading…
Reference in a new issue