*
* @see Content::prepareSave
*/
- public function prepareSave( WikiPage $page, $flags, $baseRevId, User $user ) {
+ public function prepareSave( WikiPage $page, $flags, $parentRevId, User $user ) {
if ( $this->isValid() ) {
return Status::newGood();
} else {
*
* @param WikiPage $page The page to be saved.
* @param int $flags Bitfield for use with EDIT_XXX constants, see WikiPage::doEditContent()
- * @param int $baseRevId The ID of the current revision
+ * @param int $parentRevId The ID of the current revision
* @param User $user
*
* @return Status A status object indicating whether the content was
*
* @see WikiPage::doEditContent()
*/
- public function prepareSave( WikiPage $page, $flags, $baseRevId, User $user );
+ public function prepareSave( WikiPage $page, $flags, $parentRevId, User $user );
/**
* Returns a list of updates to perform when this content is deleted.
* error will be returned. These two conditions are also possible with
* auto-detection due to MediaWiki's performance-optimised locking strategy.
*
- * @param bool|int $baseRevId The revision ID this edit was based off, if any
+ * @param bool|int $baseRevId The revision ID this edit was based off, if any.
+ * This is not the parent revision ID, rather the revision ID for older
+ * content used as the source for a rollback, for example.
* @param User $user The user doing the edit
*
* @throws MWException
* error will be returned. These two conditions are also possible with
* auto-detection due to MediaWiki's performance-optimised locking strategy.
*
- * @param bool|int $baseRevId The revision ID this edit was based off, if any
+ * @param bool|int $baseRevId The revision ID this edit was based off, if any.
+ * This is not the parent revision ID, rather the revision ID for older
+ * content used as the source for a rollback, for example.
* @param User $user The user doing the edit
* @param string $serialFormat Format for storing the content in the
* database.
$dbw->begin( __METHOD__ );
try {
- $prepStatus = $content->prepareSave( $this, $flags, $baseRevId, $user );
+ $prepStatus = $content->prepareSave( $this, $flags, $oldid, $user );
$status->merge( $prepStatus );
if ( !$status->isOK() ) {
$dbw->begin( __METHOD__ );
try {
- $prepStatus = $content->prepareSave( $this, $flags, $baseRevId, $user );
+ $prepStatus = $content->prepareSave( $this, $flags, $oldid, $user );
$status->merge( $prepStatus );
if ( !$status->isOK() ) {
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-bell {
background-image: url("themes/mediawiki/images/icons/bell.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-article {
background-image: url("themes/mediawiki/images/icons/article-ltr.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-table {
background-image: url("themes/mediawiki/images/icons/table.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-edit {
background-image: url("themes/mediawiki/images/icons/edit-ltr.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-indent {
background-image: url("themes/mediawiki/images/icons/indent-ltr.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-bigger {
background-image: url("themes/mediawiki/images/icons/bigger-ltr.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-beta {
background-image: url("themes/mediawiki/images/icons/beta.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-stripeFlow {
background-image: url("themes/mediawiki/images/icons/stripeFlow-ltr.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-map {
background-image: url("themes/mediawiki/images/icons/map-ltr.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-image {
background-image: url("themes/mediawiki/images/icons/image-ltr.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-block {
background-image: url("themes/mediawiki/images/icons/block.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-arrowNext {
background-image: url("themes/mediawiki/images/icons/arrow-ltr.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-userActive {
background-image: url("themes/mediawiki/images/icons/userActive-ltr.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-icon-logoCC {
background-image: url("themes/mediawiki/images/icons/logo-cc.png");
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
.oo-ui-toolbar-narrow .oo-ui-toolbar-tools {
white-space: normal;
}
+.oo-ui-toolbar-tools .oo-ui-tool {
+ white-space: normal;
+}
.oo-ui-toolbar-tools,
.oo-ui-toolbar-actions,
.oo-ui-toolbar-shadow {
-o-transform: scale(1);
transform: scale(1);
}
-.oo-ui-windowManager-fullscreen.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame {
- border: 0;
- border-radius: 0;
- box-shadow: none;
+.oo-ui-windowManager-modal.oo-ui-windowManager-floating > .oo-ui-dialog > .oo-ui-window-frame {
+ border: 1px solid #aaaaaa;
+ border-radius: 0.2em;
+ box-shadow: inset 0 -0.2em 0 0 rgba(0, 0, 0, 0.2);
}
.oo-ui-icon-add {
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:08:47Z
+ * Date: 2015-03-12T23:43:45Z
*/
/**
* @class
/*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-03-12T19:08:47Z
+ * Date: 2015-03-12T23:43:45Z
*/
( function ( OO ) {
// Properties
this.manager = null;
this.size = config.size || this.constructor.static.size;
- this.frame = new OO.ui.PanelLayout( {
- expanded: false,
- framed: true
- } );
- this.$frame = this.frame.$element;
+ this.$frame = $( '<div>' );
this.$overlay = $( '<div>' );
this.$content = $( '<div>' );
);
QUnit.start();
- }, 10 );
+ } );
} );
}
return;
}
// Otherwise, keep polling
- setTimeout( styleTestLoop, 150 );
+ setTimeout( styleTestLoop );
}
// Start the loop