jenkins-bot has submitted this change and it was merged.
Change subject: Bump Schema:Edit to revision 13457736
......................................................................
Bump Schema:Edit to revision 13457736
* Remove page.length
* Add action.abort.type = switchnochange
Needs to be deployed at the same time as Ib99700ac
Bug: T111420
Change-Id: I7ee245157d4de6c220d7cdf54cd1dd69ff836f15
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.trackSubscriber.js
M modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
3 files changed, 11 insertions(+), 6 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 87efefb..3ec9f60 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -797,7 +797,7 @@
*/
ve.init.mw.DesktopArticleTarget.prototype.editSource = function () {
if ( !this.getSurface().getModel().hasBeenModified() ) {
- this.switchToWikitextEditor( true );
+ this.switchToWikitextEditor( true, false );
return;
}
@@ -1356,11 +1356,16 @@
* Switches to the wikitext editor, either keeping (default) or discarding
changes.
*
* @param {boolean} [discardChanges] Whether to discard changes or not.
+ * @param {boolean} [modified] Whether there were any changes at all.
*/
-ve.init.mw.DesktopArticleTarget.prototype.switchToWikitextEditor = function (
discardChanges ) {
+ve.init.mw.DesktopArticleTarget.prototype.switchToWikitextEditor = function (
discardChanges, modified ) {
var target = this;
if ( discardChanges ) {
- ve.track( 'mwedit.abort', { type: 'switchwithout', mechanism:
'navigate' } );
+ if ( modified ) {
+ ve.track( 'mwedit.abort', { type: 'switchwithout',
mechanism: 'navigate' } );
+ } else {
+ ve.track( 'mwedit.abort', { type: 'switchnochange',
mechanism: 'navigate' } );
+ }
this.submitting = true;
location.href = this.viewUri.clone().extend( {
action: 'edit',
diff --git a/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
b/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
index f4870e2..c815a1e 100644
--- a/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
+++ b/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
@@ -52,6 +52,7 @@
case 'nochange':
case 'switchwith':
case 'switchwithout':
+ case 'switchnochange':
case 'abandon':
return timeStamp - timing.ready;
case 'abandonMidsave':
@@ -103,7 +104,6 @@
'page.title': mw.config.get( 'wgPageName' ),
'page.ns': mw.config.get( 'wgNamespaceNumber' ),
'page.revid': mw.config.get( 'wgRevisionId' ),
- 'page.length': -1, // FIXME
editingSessionId: editingSessionId,
'user.id': mw.user.getId(),
'user.editCount': mw.config.get( 'wgUserEditCount', 0 ),
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
index 2ba5b53..226301b 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
@@ -67,13 +67,13 @@
return new OO.ui.Process( function () {
this.getActions().setAbilities( { cancel: false,
discard: false } );
this.getActions().get()[ 1 ].pushPending();
- this.target.switchToWikitextEditor( false );
+ this.target.switchToWikitextEditor( false, true );
}, this );
} else if ( action === 'discard' ) {
return new OO.ui.Process( function () {
this.getActions().setAbilities( { cancel: false,
switch: false } );
this.getActions().get()[ 2 ].pushPending();
- this.target.switchToWikitextEditor( true );
+ this.target.switchToWikitextEditor( true, true );
}, this );
} else if ( action === 'cancel' ) {
return new OO.ui.Process( function () {
--
To view, visit https://gerrit.wikimedia.org/r/236198
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ee245157d4de6c220d7cdf54cd1dd69ff836f15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.26wmf21
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
