| Index: trunk/phase3/skins/common/config.css |
| — | — | @@ -9,7 +9,7 @@ |
| 10 | 10 | .config-block { |
| 11 | 11 | margin-top: 2em; |
| 12 | 12 | display: block; |
| 13 | | - |
| | 13 | + |
| 14 | 14 | } |
| 15 | 15 | .config-block-label { |
| 16 | 16 | display: block; |
| — | — | @@ -142,7 +142,7 @@ |
| 143 | 143 | .config-cc-wrapper { |
| 144 | 144 | clear: left; |
| 145 | 145 | /* If you change this height, also change it in WebInstaller_Options::submitCC() */ |
| 146 | | - height: 54em; |
| | 146 | + height: 54em; |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | .config-plainlink a { |
| Index: trunk/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -118,7 +118,7 @@ |
| 119 | 119 | $this->exportVars(); |
| 120 | 120 | $this->setupLanguage(); |
| 121 | 121 | |
| 122 | | - if( ( $this->getVar( '_InstallDone' ) || $this->getVar( '_UpgradeDone' ) ) |
| | 122 | + if( ( $this->getVar( '_InstallDone' ) || $this->getVar( '_UpgradeDone' ) ) |
| 123 | 123 | && $this->request->getVal( 'localsettings' ) ) |
| 124 | 124 | { |
| 125 | 125 | $this->request->response()->header( 'Content-type: text/plain' ); |
| — | — | @@ -620,7 +620,7 @@ |
| 621 | 621 | " title=\"" . $html . "\"\n" . |
| 622 | 622 | " original-title=\"" . $html . "\"></span>\n"; |
| 623 | 623 | } |
| 624 | | - |
| | 624 | + |
| 625 | 625 | /** |
| 626 | 626 | * Output a help box. |
| 627 | 627 | */ |
| — | — | @@ -687,7 +687,7 @@ |
| 688 | 688 | " </div>\n" . |
| 689 | 689 | "</div>\n"; |
| 690 | 690 | } |
| 691 | | - |
| | 691 | + |
| 692 | 692 | /** |
| 693 | 693 | * Get a labelled text box to configure a variable. |
| 694 | 694 | * |
| — | — | @@ -732,7 +732,7 @@ |
| 733 | 733 | $params['help'] |
| 734 | 734 | ); |
| 735 | 735 | } |
| 736 | | - |
| | 736 | + |
| 737 | 737 | /** |
| 738 | 738 | * Get a labelled password box to configure a variable. |
| 739 | 739 | * |
| Index: trunk/phase3/config/Installer.php |
| — | — | @@ -1685,14 +1685,14 @@ |
| 1686 | 1686 | </div> |
| 1687 | 1687 | </fieldset> |
| 1688 | 1688 | |
| 1689 | | - |
| | 1689 | + |
| 1690 | 1690 | <?php database_switcher($ourdb, 'mssql' ); ?> |
| 1691 | 1691 | <div class="config-desc"> |
| 1692 | 1692 | <p>No MS SQL Server specific options at this time.</p> |
| 1693 | 1693 | </div> |
| 1694 | 1694 | </fieldset> |
| 1695 | | - |
| 1696 | | - |
| | 1695 | + |
| | 1696 | + |
| 1697 | 1697 | <?php database_switcher($ourdb, 'ibm_db2'); ?> |
| 1698 | 1698 | <div class="config-input"><?php |
| 1699 | 1699 | aField( $conf, "DBport_db2", "Database port:" ); |
| Index: trunk/phase3/resources/jquery/jquery.placeholder.js |
| — | — | @@ -1,8 +1,8 @@ |
| 2 | 2 | /** |
| 3 | 3 | * HTML5 placeholder emulation for jQuery plugin |
| 4 | | - * |
| | 4 | + * |
| 5 | 5 | * This will automatically use the HTML5 placeholder attribute if supported, or emulate this behavior if not. |
| 6 | | - * |
| | 6 | + * |
| 7 | 7 | * @author Trevor Parscal <tparscal@wikimedia.org> |
| 8 | 8 | * @author Krinkle <krinklemail@gmail.com> |
| 9 | 9 | * @version 0.2.0 |
| Index: trunk/phase3/resources/mediawiki.util/mediawiki.util.js |
| — | — | @@ -27,17 +27,17 @@ |
| 28 | 28 | // Chrome on any platform |
| 29 | 29 | } else if ( profile.name == 'chrome' ) { |
| 30 | 30 | // Chrome on Mac or Chrome on other platform ? |
| 31 | | - mw.util.tooltipAccessKeyPrefix = ( profile.platform == 'mac' |
| | 31 | + mw.util.tooltipAccessKeyPrefix = ( profile.platform == 'mac' |
| 32 | 32 | ? 'ctrl-option-' : 'alt-' ); |
| 33 | 33 | |
| 34 | 34 | // Non-Windows Safari with webkit_version > 526 |
| 35 | | - } else if ( profile.platform !== 'win' |
| 36 | | - && profile.name == 'safari' |
| 37 | | - && profile.layoutVersion > 526 ) |
| | 35 | + } else if ( profile.platform !== 'win' |
| | 36 | + && profile.name == 'safari' |
| | 37 | + && profile.layoutVersion > 526 ) |
| 38 | 38 | { |
| 39 | 39 | mw.util.tooltipAccessKeyPrefix = 'ctrl-alt-'; |
| 40 | 40 | |
| 41 | | - // Safari/Konqueror on any platform, or any browser on Mac |
| | 41 | + // Safari/Konqueror on any platform, or any browser on Mac |
| 42 | 42 | // (but not Safari on Windows) |
| 43 | 43 | } else if ( !( profile.platform == 'win' && profile.name == 'safari' ) |
| 44 | 44 | && ( profile.name == 'safari' |
| — | — | @@ -128,16 +128,16 @@ |
| 129 | 129 | }, |
| 130 | 130 | |
| 131 | 131 | /** |
| 132 | | - * Check is a variable is empty. Supports strings, booleans, arrays and |
| 133 | | - * objects. The string "0" is considered empty. A string containing only |
| | 132 | + * Check is a variable is empty. Supports strings, booleans, arrays and |
| | 133 | + * objects. The string "0" is considered empty. A string containing only |
| 134 | 134 | * whitespace (ie. " ") is considered not empty. |
| 135 | 135 | * |
| 136 | 136 | * @param v The variable to check for emptyness |
| 137 | 137 | */ |
| 138 | 138 | 'isEmpty' : function( v ) { |
| 139 | 139 | var key; |
| 140 | | - if ( v === "" || v === 0 || v === "0" || v === null |
| 141 | | - || v === false || typeof v === 'undefined' ) |
| | 140 | + if ( v === "" || v === 0 || v === "0" || v === null |
| | 141 | + || v === false || typeof v === 'undefined' ) |
| 142 | 142 | { |
| 143 | 143 | return true; |
| 144 | 144 | } |
| — | — | @@ -164,7 +164,7 @@ |
| 165 | 165 | 'getParamValue' : function( param, url ) { |
| 166 | 166 | url = url ? url : document.location.href; |
| 167 | 167 | // Get last match, stop at hash |
| 168 | | - var re = new RegExp( '[^#]*[&?]' + $.escapeRE( param ) + '=([^&#]*)' ); |
| | 168 | + var re = new RegExp( '[^#]*[&?]' + $.escapeRE( param ) + '=([^&#]*)' ); |
| 169 | 169 | var m = re.exec( url ); |
| 170 | 170 | if ( m && m.length > 1 ) { |
| 171 | 171 | return decodeURIComponent( m[1] ); |
| — | — | @@ -173,7 +173,7 @@ |
| 174 | 174 | }, |
| 175 | 175 | |
| 176 | 176 | // Access key prefix. |
| 177 | | - // Will be re-defined based on browser/operating system detection in |
| | 177 | + // Will be re-defined based on browser/operating system detection in |
| 178 | 178 | // mw.util.init(). |
| 179 | 179 | 'tooltipAccessKeyPrefix' : 'alt-', |
| 180 | 180 | |
| — | — | @@ -195,9 +195,9 @@ |
| 196 | 196 | } else if ( nodeList ) { |
| 197 | 197 | $nodes = $(nodeList); |
| 198 | 198 | } else { |
| 199 | | - // Rather than scanning all links, just the elements that |
| | 199 | + // Rather than scanning all links, just the elements that |
| 200 | 200 | // contain the relevant links |
| 201 | | - this.updateTooltipAccessKeys( |
| | 201 | + this.updateTooltipAccessKeys( |
| 202 | 202 | $('#column-one a, #mw-head a, #mw-panel a, #p-logo a') ); |
| 203 | 203 | |
| 204 | 204 | // these are rare enough that no such optimization is needed |
| — | — | @@ -209,7 +209,7 @@ |
| 210 | 210 | $nodes.each( function ( i ) { |
| 211 | 211 | var tip = $(this).attr( 'title' ); |
| 212 | 212 | if ( !!tip && mw.util.tooltipAccessKeyRegexp.exec( tip ) ) { |
| 213 | | - tip = tip.replace( mw.util.tooltipAccessKeyRegexp, |
| | 213 | + tip = tip.replace( mw.util.tooltipAccessKeyRegexp, |
| 214 | 214 | '[' + mw.util.tooltipAccessKeyPrefix + "$5]" ); |
| 215 | 215 | $(this).attr( 'title', tip ); |
| 216 | 216 | } |
| — | — | @@ -223,37 +223,37 @@ |
| 224 | 224 | /** |
| 225 | 225 | * Add a link to a portlet menu on the page, such as: |
| 226 | 226 | * |
| 227 | | - * p-cactions (Content actions), p-personal (Personal tools), |
| | 227 | + * p-cactions (Content actions), p-personal (Personal tools), |
| 228 | 228 | * p-navigation (Navigation), p-tb (Toolbox) |
| 229 | 229 | * |
| 230 | 230 | * The first three paramters are required, others are optionals. Though |
| 231 | 231 | * providing an id and tooltip is recommended. |
| 232 | 232 | * |
| 233 | | - * By default the new link will be added to the end of the list. To |
| 234 | | - * add the link before a given existing item, pass the DOM node |
| 235 | | - * (document.getElementById('foobar')) or the jQuery-selector |
| | 233 | + * By default the new link will be added to the end of the list. To |
| | 234 | + * add the link before a given existing item, pass the DOM node |
| | 235 | + * (document.getElementById('foobar')) or the jQuery-selector |
| 236 | 236 | * ('#foobar') of that item. |
| 237 | 237 | * |
| 238 | 238 | * @example mw.util.addPortletLink( |
| 239 | | - * 'p-tb', 'http://mediawiki.org/', |
| | 239 | + * 'p-tb', 'http://mediawiki.org/', |
| 240 | 240 | * 'MediaWiki.org', 't-mworg', 'Go to MediaWiki.org ', 'm', '#t-print' |
| 241 | 241 | * ) |
| 242 | 242 | * |
| 243 | 243 | * @param portlet ID of the target portlet ('p-cactions' or 'p-personal' etc.) |
| 244 | 244 | * @param href Link URL |
| 245 | | - * @param text Link text (will be automatically converted to lower |
| | 245 | + * @param text Link text (will be automatically converted to lower |
| 246 | 246 | * case by CSS for p-cactions in Monobook) |
| 247 | | - * @param id ID of the new item, should be unique and preferably have |
| | 247 | + * @param id ID of the new item, should be unique and preferably have |
| 248 | 248 | * the appropriate prefix ('ca-', 'pt-', 'n-' or 't-') |
| 249 | 249 | * @param tooltip Text to show when hovering over the link, without accesskey suffix |
| 250 | | - * @param accesskey Access key to activate this link (one character, try |
| 251 | | - * to avoid conflicts. Use $('[accesskey=x').get() in the console to |
| | 250 | + * @param accesskey Access key to activate this link (one character, try |
| | 251 | + * to avoid conflicts. Use $('[accesskey=x').get() in the console to |
| 252 | 252 | * see if 'x' is already used. |
| 253 | | - * @param nextnode DOM node or jQuery-selector of the item that the new |
| 254 | | - * item should be added before, should be another item in the same |
| | 253 | + * @param nextnode DOM node or jQuery-selector of the item that the new |
| | 254 | + * item should be added before, should be another item in the same |
| 255 | 255 | * list will be ignored if not the so |
| 256 | 256 | * |
| 257 | | - * @return The DOM node of the new item (a LI element, or A element for |
| | 257 | + * @return The DOM node of the new item (a LI element, or A element for |
| 258 | 258 | * older skins) or null. |
| 259 | 259 | */ |
| 260 | 260 | 'addPortletLink' : function( portlet, href, text, id, tooltip, accesskey, nextnode ) { |
| — | — | @@ -291,7 +291,7 @@ |
| 292 | 292 | if ($portlet.find( 'div' ).length === 0) { |
| 293 | 293 | $portlet.append( '<ul/>' ); |
| 294 | 294 | } else { |
| 295 | | - // otherwise if there's a div (such as div.body or div.pBody) |
| | 295 | + // otherwise if there's a div (such as div.body or div.pBody) |
| 296 | 296 | // append the <ul> to last (most likely only) div |
| 297 | 297 | $portlet.find( 'div' ).eq( -1 ).append( '<ul/>' ); |
| 298 | 298 | } |
| — | — | @@ -329,7 +329,7 @@ |
| 330 | 330 | if ( nextnode && nextnode.parentNode == $ul.get( 0 ) ) { |
| 331 | 331 | $(nextnode).before( $item ); |
| 332 | 332 | } else { |
| 333 | | - // If the jQuery selector isn't found within the <ul>, just |
| | 333 | + // If the jQuery selector isn't found within the <ul>, just |
| 334 | 334 | // append it at the end |
| 335 | 335 | if ( $ul.find( nextnode ).length === 0 ) { |
| 336 | 336 | $ul.append( $item ); |
| Index: trunk/phase3/resources/Resources.php |
| — | — | @@ -3,15 +3,15 @@ |
| 4 | 4 | return array( |
| 5 | 5 | |
| 6 | 6 | /* Special resources who have their own classes */ |
| 7 | | - |
| | 7 | + |
| 8 | 8 | 'site' => array( 'class' => 'ResourceLoaderSiteModule' ), |
| 9 | 9 | 'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ), |
| 10 | 10 | 'user' => array( 'class' => 'ResourceLoaderUserModule' ), |
| 11 | 11 | 'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ), |
| 12 | | - |
| | 12 | + |
| 13 | 13 | /* Skins */ |
| 14 | | - |
| 15 | | - 'skins.vector' => array( |
| | 14 | + |
| | 15 | + 'skins.vector' => array( |
| 16 | 16 | 'styles' => array( 'skins/vector/screen.css' => array( 'media' => 'screen' ) ) |
| 17 | 17 | ), |
| 18 | 18 | 'skins.monobook' => array( |
| — | — | @@ -21,20 +21,20 @@ |
| 22 | 22 | //$GLOBALS['wgHandheldStyle'] => array( 'media' => 'handheld' ) |
| 23 | 23 | ) |
| 24 | 24 | ), |
| 25 | | - |
| | 25 | + |
| 26 | 26 | /* jQuery */ |
| 27 | | - |
| | 27 | + |
| 28 | 28 | 'jquery' => array( |
| 29 | | - 'scripts' => 'resources/jquery/jquery.js', |
| | 29 | + 'scripts' => 'resources/jquery/jquery.js', |
| 30 | 30 | 'debugRaw' => false |
| 31 | 31 | ), |
| 32 | | - |
| | 32 | + |
| 33 | 33 | /* jQuery Plugins */ |
| 34 | | - |
| 35 | | - 'jquery.async' => array( |
| | 34 | + |
| | 35 | + 'jquery.async' => array( |
| 36 | 36 | 'scripts' => 'resources/jquery/jquery.async.js' |
| 37 | 37 | ), |
| 38 | | - 'jquery.autoEllipsis' => array( |
| | 38 | + 'jquery.autoEllipsis' => array( |
| 39 | 39 | 'scripts' => 'resources/jquery/jquery.autoEllipsis.js' |
| 40 | 40 | ), |
| 41 | 41 | 'jquery.checkboxShiftClick' => array( |
| — | — | @@ -78,9 +78,9 @@ |
| 79 | 79 | 'scripts' => 'resources/jquery.tipsy/jquery.tipsy.js', |
| 80 | 80 | 'styles' => 'resources/jquery.tipsy/jquery.tipsy.css', |
| 81 | 81 | ), |
| 82 | | - |
| | 82 | + |
| 83 | 83 | /* jQuery UI */ |
| 84 | | - |
| | 84 | + |
| 85 | 85 | // Core |
| 86 | 86 | 'jquery.ui.core' => array( |
| 87 | 87 | 'scripts' => 'resources/jquery.ui/jquery.ui.core.js', |
| — | — | @@ -113,8 +113,8 @@ |
| 114 | 114 | ), |
| 115 | 115 | 'jquery.ui.droppable' => array( |
| 116 | 116 | 'scripts' => 'resources/jquery.ui/jquery.ui.droppable.js', |
| 117 | | - 'dependencies' => array( |
| 118 | | - 'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget', 'jquery.ui.draggable' |
| | 117 | + 'dependencies' => array( |
| | 118 | + 'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget', 'jquery.ui.draggable' |
| 119 | 119 | ), |
| 120 | 120 | ), |
| 121 | 121 | 'jquery.ui.resizable' => array( |
| — | — | @@ -317,9 +317,9 @@ |
| 318 | 318 | 'scripts' => 'resources/jquery.effects/jquery.effects.transfer.js', |
| 319 | 319 | 'dependencies' => 'jquery.effects.core', |
| 320 | 320 | ), |
| 321 | | - |
| | 321 | + |
| 322 | 322 | /* MediaWiki */ |
| 323 | | - |
| | 323 | + |
| 324 | 324 | 'mediawiki' => array( |
| 325 | 325 | 'scripts' => 'resources/mediawiki/mediawiki.js', |
| 326 | 326 | 'debugScripts' => 'resources/mediawiki/mediawiki.log.js', |
| — | — | @@ -394,14 +394,14 @@ |
| 395 | 395 | 'wa' => 'resources/mediawiki.language/languages/wa.js', |
| 396 | 396 | ), |
| 397 | 397 | ), |
| 398 | | - |
| | 398 | + |
| 399 | 399 | /* mediawiki Legacy */ |
| 400 | | - |
| | 400 | + |
| 401 | 401 | 'mediawiki.legacy.ajax' => array( |
| 402 | 402 | 'scripts' => 'skins/common/ajax.js', |
| 403 | | - 'messages' => array( |
| 404 | | - 'watch', 'unwatch', 'watching', 'unwatching', 'tooltip-ca-watch', |
| 405 | | - 'tooltip-ca-unwatch' |
| | 403 | + 'messages' => array( |
| | 404 | + 'watch', 'unwatch', 'watching', 'unwatching', 'tooltip-ca-watch', |
| | 405 | + 'tooltip-ca-unwatch' |
| 406 | 406 | ), |
| 407 | 407 | 'dependencies' => 'mediawiki.legacy.wikibits', |
| 408 | 408 | ), |
| Index: trunk/phase3/resources/mediawiki.language/mediawiki.language.js |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | } |
| 28 | 28 | // Restore the count into a Number ( if it got converted earlier ) |
| 29 | 29 | var count = mediaWiki.language.convertNumber( template.title, true ); |
| 30 | | - // Do convertPlural call |
| | 30 | + // Do convertPlural call |
| 31 | 31 | return mediaWiki.language.convertPlural( parseInt( count ), template.parameters ); |
| 32 | 32 | } |
| 33 | 33 | // Could not process plural return first form or nothing |
| Index: trunk/phase3/resources/startup.js |
| — | — | @@ -1,14 +1,14 @@ |
| 2 | 2 | /** |
| 3 | | - * This script provides a function which is run to evaluate whether or not to |
| 4 | | - * continue loading the jquery and mediawiki modules. This code should work on |
| | 3 | + * This script provides a function which is run to evaluate whether or not to |
| | 4 | + * continue loading the jquery and mediawiki modules. This code should work on |
| 5 | 5 | * even the most ancient of browsers, so be very careful when editing. |
| 6 | 6 | */ |
| 7 | 7 | /** |
| 8 | 8 | * Returns false when run in a black-listed browser |
| 9 | | - * |
| 10 | | - * This function will be deleted after it's used, so do not expand it to be |
| | 9 | + * |
| | 10 | + * This function will be deleted after it's used, so do not expand it to be |
| 11 | 11 | * generally useful beyond startup |
| 12 | | - * |
| | 12 | + * |
| 13 | 13 | * jQuery has minimum requirements of: |
| 14 | 14 | * * Firefox 2.0+ |
| 15 | 15 | * * Internet Explorer 6+ |
| — | — | @@ -18,7 +18,7 @@ |
| 19 | 19 | */ |
| 20 | 20 | var isCompatible = function() { |
| 21 | 21 | // IE < 6 |
| 22 | | - if ( navigator.appVersion.indexOf( 'MSIE' ) !== -1 |
| | 22 | + if ( navigator.appVersion.indexOf( 'MSIE' ) !== -1 |
| 23 | 23 | && parseFloat( navigator.appVersion.split( 'MSIE' )[1] ) < 6 ) |
| 24 | 24 | { |
| 25 | 25 | return false; |