| Index: branches/REL1_19/phase3/skins/common/shared.css |
| — | — | @@ -1023,7 +1023,8 @@ |
| 1024 | 1024 | } |
| 1025 | 1025 | |
| 1026 | 1026 | /* Accessibility */ |
| 1027 | | -.mw-jump { |
| | 1027 | +.mw-jump, |
| | 1028 | +#jump-to-nav { |
| 1028 | 1029 | overflow: hidden; |
| 1029 | 1030 | height: 0; |
| 1030 | 1031 | zoom: 1; /* http://webaim.org/techniques/skipnav/#iequirk */ |
| Index: branches/REL1_19/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -246,8 +246,8 @@ |
| 247 | 247 | getText() on a non-object |
| 248 | 248 | * (bug 31676) Group dynamically inserted CSS into a single <style> tag, to work |
| 249 | 249 | around a bug where not all styles were applied in Internet Explorer |
| 250 | | -* (bug 28936, bug 5280) Broken or invalid titles can't be removed from watchlist. |
| 251 | | -* (Bug 33087) Exchange server rejected mail sent by MediaWiki |
| | 250 | +* (bug 28936, bug 5280) Broken or invalid titles can't be removed from watchlist.* (Bug 33087) Exchange server rejected mail sent by MediaWiki |
| | 251 | +* (bug 34600) Older skins using useHeadElement=false were broken in 1.18 |
| 252 | 252 | |
| 253 | 253 | === API changes in 1.19 === |
| 254 | 254 | * Made action=edit less likely to return "unknownerror", by returning the actual error |
| Index: branches/REL1_19/phase3/includes/debug/Debug.php |
| — | — | @@ -62,7 +62,7 @@ |
| 63 | 63 | */ |
| 64 | 64 | public static function addModules( OutputPage $out ) { |
| 65 | 65 | if ( self::$enabled ) { |
| 66 | | - $out->addModules( 'mediawiki.debug' ); |
| | 66 | + $out->addModules( 'mediawiki.debug.init' ); |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
| — | — | @@ -271,12 +271,15 @@ |
| 272 | 272 | 'memoryPeak' => $context->getLanguage()->formatSize( memory_get_peak_usage() ), |
| 273 | 273 | 'includes' => self::getFilesIncluded( $context ), |
| 274 | 274 | ); |
| 275 | | - // TODO: Clean this up |
| 276 | | - $html = Html::openElement( 'script' ); |
| 277 | | - $html .= 'var debugInfo = ' . Xml::encodeJsVar( $debugInfo ) . ';'; |
| 278 | | - $html .= " $(function() { mw.loader.using( 'mediawiki.debug', function() { mw.Debug.init( debugInfo ) } ); }); "; |
| 279 | | - $html .= Html::closeElement( 'script' ); |
| 280 | 275 | |
| | 276 | + // Cannot use OutputPage::addJsConfigVars because those are already outputted |
| | 277 | + // by the time this method is called. |
| | 278 | + $html = Html::inlineScript( |
| | 279 | + ResourceLoader::makeLoaderConditionalScript( |
| | 280 | + ResourceLoader::makeConfigSetScript( array( 'debugInfo' => $debugInfo ) ) |
| | 281 | + ) |
| | 282 | + ); |
| | 283 | + |
| 281 | 284 | return $html; |
| 282 | 285 | } |
| 283 | 286 | } |
| Index: branches/REL1_19/phase3/includes/SkinTemplate.php |
| — | — | @@ -455,7 +455,7 @@ |
| 456 | 456 | if ( $this->useHeadElement ) { |
| 457 | 457 | $tpl->set( 'headelement', $out->headElement( $this ) ); |
| 458 | 458 | } else { |
| 459 | | - $tpl->set( 'headscripts', $out->getScript() ); |
| | 459 | + $tpl->set( 'headscripts', $out->getHeadScripts() . $out->getHeadItems() ); |
| 460 | 460 | } |
| 461 | 461 | |
| 462 | 462 | $tpl->set( 'debughtml', $this->generateDebugHTML() ); |
| Property changes on: branches/REL1_19/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 463 | 463 | Merged /trunk/phase3/includes:r111380,111809,111983,112034,112037,112152 |
| Index: branches/REL1_19/phase3/resources/mediawiki.action/mediawiki.action.edit.js |
| — | — | @@ -3,7 +3,7 @@ |
| 4 | 4 | var currentFocused = $( '#wpTextbox1' ); |
| 5 | 5 | |
| 6 | 6 | mw.toolbar = { |
| 7 | | - $toolbar : $( '#toolbar' ), |
| | 7 | + $toolbar : [], |
| 8 | 8 | buttons : [], |
| 9 | 9 | // If you want to add buttons, use |
| 10 | 10 | // mw.toolbar.addButton( imageFile, speedTip, tagOpen, tagClose, sampleText, imageId, selectText ); |
| — | — | @@ -37,7 +37,12 @@ |
| 38 | 38 | ); |
| 39 | 39 | } |
| 40 | 40 | }, |
| 41 | | - init : function() { |
| | 41 | + |
| | 42 | + // For backwards compatibility |
| | 43 | + init : function() {}, |
| | 44 | + |
| | 45 | + onReady : function() { |
| | 46 | + mw.toolbar.$toolbar = $( '#toolbar' ); |
| 42 | 47 | // Legacy |
| 43 | 48 | // Merge buttons from mwCustomEditButtons |
| 44 | 49 | var buttons = [].concat( this.buttons, window.mwCustomEditButtons ); |
| — | — | @@ -59,10 +64,12 @@ |
| 60 | 65 | window.addButton = mw.toolbar.addButton; |
| 61 | 66 | window.insertTags = mw.toolbar.insertTags; |
| 62 | 67 | |
| 63 | | - //make sure edit summary does not exceed byte limit |
| 64 | | - $( '#wpSummary' ).byteLimit( 250 ); |
| | 68 | + $( document ).ready( function() { |
| | 69 | + mw.toolbar.onReady(); |
| 65 | 70 | |
| 66 | | - $( document ).ready( function() { |
| | 71 | + // Make sure edit summary does not exceed byte limit |
| | 72 | + $( '#wpSummary' ).byteLimit( 250 ); |
| | 73 | + |
| 67 | 74 | /** |
| 68 | 75 | * Restore the edit box scroll state following a preview operation, |
| 69 | 76 | * and set up a form submission handler to remember this state |
| Index: branches/REL1_19/phase3/resources/Resources.php |
| — | — | @@ -537,13 +537,21 @@ |
| 538 | 538 | ), |
| 539 | 539 | 'mediawiki.api.watch' => array( |
| 540 | 540 | 'scripts' => 'resources/mediawiki.api/mediawiki.api.watch.js', |
| 541 | | - 'dependencies' => 'mediawiki.api', |
| | 541 | + 'dependencies' => array('mediawiki.api', 'mediawiki.user'), |
| 542 | 542 | ), |
| 543 | 543 | 'mediawiki.debug' => array( |
| 544 | 544 | 'scripts' => 'resources/mediawiki/mediawiki.debug.js', |
| 545 | 545 | 'styles' => 'resources/mediawiki/mediawiki.debug.css', |
| 546 | 546 | 'dependencies' => 'jquery.footHovzer', |
| | 547 | + 'position' => 'bottom', |
| 547 | 548 | ), |
| | 549 | + 'mediawiki.debug.init' => array( |
| | 550 | + 'scripts' => 'resources/mediawiki/mediawiki.debug.init.js', |
| | 551 | + 'dependencies' => 'mediawiki.debug', |
| | 552 | + // Uses a custom mw.config variable that is set in debughtml, |
| | 553 | + // must be loaded on the bottom |
| | 554 | + 'position' => 'bottom', |
| | 555 | + ), |
| 548 | 556 | 'mediawiki.feedback' => array( |
| 549 | 557 | 'scripts' => 'resources/mediawiki/mediawiki.feedback.js', |
| 550 | 558 | 'dependencies' => array( |
| Index: branches/REL1_19/phase3/resources/mediawiki/mediawiki.debug.js |
| — | — | @@ -1,5 +1,5 @@ |
| 2 | 2 | /** |
| 3 | | - * JavaScript for the new debug toolbar, enabled with $wgDebugToolbar |
| | 3 | + * JavaScript for the new debug toolbar, enabled through $wgDebugToolbar. |
| 4 | 4 | * |
| 5 | 5 | * @author John Du Hart |
| 6 | 6 | * @since 1.19 |
| — | — | @@ -26,13 +26,15 @@ |
| 27 | 27 | data: {}, |
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | | - * Initializes the debugging pane |
| | 30 | + * Initializes the debugging pane. |
| | 31 | + * Shouldn't be called before the document is ready |
| | 32 | + * (since it binds to elements on the page). |
| 31 | 33 | * |
| 32 | | - * @param {Object} data |
| | 34 | + * @param {Object} data, defaults to 'debugInfo' from mw.config |
| 33 | 35 | */ |
| 34 | 36 | init: function ( data ) { |
| 35 | 37 | |
| 36 | | - this.data = data; |
| | 38 | + this.data = data || mw.config.get( 'debugInfo' ); |
| 37 | 39 | this.buildHtml(); |
| 38 | 40 | |
| 39 | 41 | // Insert the container into the DOM |
| Index: branches/REL1_19/phase3/resources/mediawiki/mediawiki.debug.init.js |
| — | — | @@ -0,0 +1,3 @@ |
| | 2 | +jQuery( function () { |
| | 3 | + mediaWiki.Debug.init(); |
| | 4 | +} ); |
| Property changes on: branches/REL1_19/phase3/resources/mediawiki/mediawiki.debug.init.js |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 5 | + native |
| Property changes on: branches/REL1_19/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 6 | Merged /trunk/phase3:r111380,111809,111983,112034,112037,112152 |