https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112647
Revision: 112647
Author: reedy
Date: 2012-02-28 21:21:46 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
MFT r112384, r112400, r112408, r112451, r112456, r112474, r112526, r112533,
r112534, r112538, r112567
Modified Paths:
--------------
branches/REL1_19/phase3/RELEASE-NOTES-1.19
branches/REL1_19/phase3/includes/ImagePage.php
branches/REL1_19/phase3/includes/MessageBlobStore.php
branches/REL1_19/phase3/includes/Pager.php
branches/REL1_19/phase3/includes/filerepo/backend/TempFSFile.php
branches/REL1_19/phase3/includes/resourceloader/ResourceLoaderContext.php
branches/REL1_19/phase3/resources/jquery.ui/themes/vector/jquery.ui.datepicker.css
branches/REL1_19/phase3/resources/mediawiki/mediawiki.js
branches/REL1_19/phase3/resources/mediawiki.action/mediawiki.action.edit.js
Property Changed:
----------------
branches/REL1_19/phase3/
branches/REL1_19/phase3/includes/
Property changes on: branches/REL1_19/phase3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111380,111478,111571,111574,111580,111597,111658,111673,111695,111697,111809,111832,111983,112021,112034,112037,112045-112046,112049,112061,112066,112079,112128,112152,112169-112170,112172-112173,112179,112184,112290,112313
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111380,111478,111571,111574,111580,111597,111658,111673,111695,111697,111809,111832,111983,112021,112034,112037,112045-112046,112049,112061,112066,112079,112128,112152,112169-112170,112172-112173,112179,112184,112290,112313,112384,112400,112408,112451,112456,112474,112526,112533-112534,112538,112567
Modified: branches/REL1_19/phase3/RELEASE-NOTES-1.19
===================================================================
--- branches/REL1_19/phase3/RELEASE-NOTES-1.19 2012-02-28 21:17:52 UTC (rev
112646)
+++ branches/REL1_19/phase3/RELEASE-NOTES-1.19 2012-02-28 21:21:46 UTC (rev
112647)
@@ -122,11 +122,17 @@
* sha1 xml tag added to XML dump file.
* (bug 33646) Badtitle error page now emits a 400 HTTP status.
* Special:MovePage now has a dropdown menu for namespaces.
+* (bug 33952) Refactor mw.toolbar to allow dynamic additions at any time.
=== Bug fixes in 1.19 ===
* $wgUploadNavigationUrl should be used for file redlinks if.
$wgUploadMissingFileUrl is not set. The first was used for this
until the second was introduced in 1.17.
+* BREAKING CHANGE: Style rules for wikitable are now more specific and prevent
+ inheritance to nested tables which caused various issues (bug 30485 and bug
+ 33434). If your wiki has overriden rules for ".wikitable", please revise
them and
+ adjust where neccecary. For comparison, use the "table.wikitable" section in
+ skins/common/shared.css as base.
* (bug 27894) Move 'editondblclick' event listener down from body to
div#bodyContent.
* (bug 30172) The check for posix_isatty() in maintenance scripts did not
detect
@@ -214,8 +220,6 @@
for backward compatibility.
* (bug 31469) Make sure tracking category messages expand variables like
{{NAMESPACE}} relative to correct title.
-* (bug 30485 and bug 33434) Style rules for wikitable are now more specific and
- prevent inheritance to nested tables which caused various issues.
* (bug 33454) ISO-8601 week-based year number (format character 'o') is now
calculated correctly with respect to timezone.
* (bug 32219) InstantCommons now fetches content from Wikimedia Commons using
Property changes on: branches/REL1_19/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111380,111571,111574,111597,111658,111673,111695,111697,111809,111832,111983,112021,112034,112037,112045-112046,112049,112061,112066,112079,112128,112152,112184,112290,112313
+ /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111380,111571,111574,111597,111658,111673,111695,111697,111809,111832,111983,112021,112034,112037,112045-112046,112049,112061,112066,112079,112128,112152,112184,112290,112313,112408,112451,112456,112474,112526,112533-112534,112538,112567
Modified: branches/REL1_19/phase3/includes/ImagePage.php
===================================================================
--- branches/REL1_19/phase3/includes/ImagePage.php 2012-02-28 21:17:52 UTC
(rev 112646)
+++ branches/REL1_19/phase3/includes/ImagePage.php 2012-02-28 21:21:46 UTC
(rev 112647)
@@ -108,8 +108,6 @@
}
}
- $this->showRedirectedFromHeader();
-
if ( $wgShowEXIF && $this->displayImg->exists() ) {
// @todo FIXME: Bad interface, see note on
MediaHandler::formatMetadata().
$formattedMetadata =
$this->displayImg->formatMetadata();
Modified: branches/REL1_19/phase3/includes/MessageBlobStore.php
===================================================================
--- branches/REL1_19/phase3/includes/MessageBlobStore.php 2012-02-28
21:17:52 UTC (rev 112646)
+++ branches/REL1_19/phase3/includes/MessageBlobStore.php 2012-02-28
21:21:46 UTC (rev 112647)
@@ -350,12 +350,7 @@
$messages = array();
foreach ( $module->getMessages() as $key ) {
- $messages[$key] =
- Sanitizer::normalizeCharReferences(
- Sanitizer::removeHTMLtags(
- wfMsgExt( $key, array(
'language' => $lang ) )
- )
- );
+ $messages[$key] = wfMsgExt( $key, array( 'language' =>
$lang ) );
}
return FormatJson::encode( (object)$messages );
Modified: branches/REL1_19/phase3/includes/Pager.php
===================================================================
--- branches/REL1_19/phase3/includes/Pager.php 2012-02-28 21:17:52 UTC (rev
112646)
+++ branches/REL1_19/phase3/includes/Pager.php 2012-02-28 21:21:46 UTC (rev
112647)
@@ -472,7 +472,7 @@
}
# Don't announce the limit everywhere if it's the default
- $urlLimit = $this->mLimit == $this->mDefaultLimit ? '' :
$this->mLimit;
+ $urlLimit = $this->mLimit == $this->mDefaultLimit ? null :
$this->mLimit;
if ( $this->mIsFirst ) {
$prev = false;
Modified: branches/REL1_19/phase3/includes/filerepo/backend/TempFSFile.php
===================================================================
--- branches/REL1_19/phase3/includes/filerepo/backend/TempFSFile.php
2012-02-28 21:17:52 UTC (rev 112646)
+++ branches/REL1_19/phase3/includes/filerepo/backend/TempFSFile.php
2012-02-28 21:21:46 UTC (rev 112647)
@@ -11,7 +11,7 @@
* @ingroup FileBackend
*/
class TempFSFile extends FSFile {
- protected $canDelete = true; // garbage collect the temp file
+ protected $canDelete = false; // bool; garbage collect the temp file
/** @var Array of active temp files to purge on shutdown */
protected static $instances = array();
@@ -41,6 +41,7 @@
}
}
$tmpFile = new self( $path );
+ $tmpFile->canDelete = true; // safely instantiated
return $tmpFile;
}
Modified:
branches/REL1_19/phase3/includes/resourceloader/ResourceLoaderContext.php
===================================================================
--- branches/REL1_19/phase3/includes/resourceloader/ResourceLoaderContext.php
2012-02-28 21:17:52 UTC (rev 112646)
+++ branches/REL1_19/phase3/includes/resourceloader/ResourceLoaderContext.php
2012-02-28 21:21:46 UTC (rev 112647)
@@ -63,7 +63,9 @@
$this->only = $request->getVal( 'only' );
$this->version = $request->getVal( 'version' );
- if ( !$this->skin ) {
+ $skinnames = Skin::getSkinNames();
+ // If no skin is specified, or we don't recognize the skin, use
the default skin
+ if ( !$this->skin || !isset( $skinnames[$this->skin] ) ) {
$this->skin = $wgDefaultSkin;
}
}
Modified:
branches/REL1_19/phase3/resources/jquery.ui/themes/vector/jquery.ui.datepicker.css
===================================================================
---
branches/REL1_19/phase3/resources/jquery.ui/themes/vector/jquery.ui.datepicker.css
2012-02-28 21:17:52 UTC (rev 112646)
+++
branches/REL1_19/phase3/resources/jquery.ui/themes/vector/jquery.ui.datepicker.css
2012-02-28 21:21:46 UTC (rev 112647)
@@ -1,6 +1,6 @@
/* Datepicker
----------------------------------*/
-.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker
.ui-datepicker-next-hover { top: 1px; }
Modified: branches/REL1_19/phase3/resources/mediawiki/mediawiki.js
===================================================================
--- branches/REL1_19/phase3/resources/mediawiki/mediawiki.js 2012-02-28
21:17:52 UTC (rev 112646)
+++ branches/REL1_19/phase3/resources/mediawiki/mediawiki.js 2012-02-28
21:21:46 UTC (rev 112647)
@@ -615,6 +615,7 @@
j -= 1;
}
}
+ throw e;
}
}
@@ -770,7 +771,6 @@
console.log(
'mw.loader::execute> Exception thrown by ' + module + ': ' + e.message );
}
registry[module].state = 'error';
- throw e;
}
}
@@ -1183,7 +1183,8 @@
* "text/javascript"; if no type is provided,
text/javascript is assumed.
* @param async {Boolean} (optional) If true,
load modules asynchronously
* even if document ready has not yet
occurred. If false (default),
- * block before document ready and load async
after
+ * block before document ready and load async
after. If not set, true will
+ * be assumed if loading a URL, and false will
be assumed otherwise.
*/
load: function ( modules, type, async ) {
var filtered, m;
@@ -1196,6 +1197,10 @@
if ( typeof modules === 'string' ) {
// Support adding arbitrary
external scripts
if ( /^(https?:)?\/\//.test(
modules ) ) {
+ if ( async ===
undefined ) {
+ // Assume async
for bug 34542
+ async = true;
+ }
if ( type ===
'text/css' ) {
$( 'head'
).append( $( '<link>', {
rel:
'stylesheet',
Modified:
branches/REL1_19/phase3/resources/mediawiki.action/mediawiki.action.edit.js
===================================================================
--- branches/REL1_19/phase3/resources/mediawiki.action/mediawiki.action.edit.js
2012-02-28 21:17:52 UTC (rev 112646)
+++ branches/REL1_19/phase3/resources/mediawiki.action/mediawiki.action.edit.js
2012-02-28 21:21:46 UTC (rev 112647)
@@ -3,12 +3,17 @@
var currentFocused = $( '#wpTextbox1' );
mw.toolbar = {
- $toolbar : [],
+ $toolbar : false,
buttons : [],
+ isReady : false,
// If you want to add buttons, use
// mw.toolbar.addButton( imageFile, speedTip, tagOpen,
tagClose, sampleText, imageId, selectText );
addButton : function() {
- this.buttons.push( [].slice.call( arguments ) );
+ if ( this.isReady ) {
+ this.insertButton.apply( this, arguments );
+ } else {
+ this.buttons.push( [].slice.call( arguments ) );
+ }
},
insertButton : function( imageFile, speedTip, tagOpen,
tagClose, sampleText, imageId, selectText ) {
var image = $('<img>', {
@@ -42,18 +47,20 @@
init : function() {},
onReady : function() {
- mw.toolbar.$toolbar = $( '#toolbar' );
+ this.$toolbar = $( '#toolbar' );
+ this.isReady = true;
// Legacy
// Merge buttons from mwCustomEditButtons
var buttons = [].concat( this.buttons,
window.mwCustomEditButtons );
for ( var i = 0; i < buttons.length; i++ ) {
if ( $.isArray( buttons[i] ) ) {
// Passes our button array as arguments
- mw.toolbar.insertButton.apply( this,
buttons[i] );
+ this.insertButton.apply( this,
buttons[i] );
} else {
// Legacy mwCustomEditButtons is an
object
var c = buttons[i];
- mw.toolbar.insertButton( c.imageFile,
c.speedTip, c.tagOpen, c.tagClose, c.sampleText, c.imageId, c.selectText );
+ this.insertButton( c.imageFile,
c.speedTip, c.tagOpen,
+ c.tagClose, c.sampleText,
c.imageId, c.selectText );
}
}
return true;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
