Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/147646
Change subject: Don't confirm if there's no changes when switching to edit
source mode through the page options menu
......................................................................
Don't confirm if there's no changes when switching to edit source mode through
the page options menu
Also use a simpler way to discard changes
Bug: 68229
Change-Id: I1efc40f14fca0f743df699a4f3aadd4ba3a249e2
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 15 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/46/147646/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index f894aee..fba6869 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -900,6 +900,15 @@
var $documentNode =
this.surface.getView().getDocument().getDocumentNode().$element,
target = this;
+ if ( !this.surface.getModel().hasBeenModified() ) {
+ target.submitting = true;
+ window.location.href = this.viewUri.clone().extend( {
+ 'action': 'edit',
+ 'veswitched': 1
+ } ).toString();
+ return;
+ }
+
$documentNode.css( 'opacity', 0.5 );
this.surface.getDialogs().openWindow( 'wikitextswitchconfirm' ).then(
function ( opened ) {
@@ -920,23 +929,10 @@
);
} else if ( data.action === 'discard' )
{
target.submitting = true;
- $( '<form method="get"
style="display: none;"></form>' ).append(
- $( '<input>' ).attr( {
- 'name':
'action',
- 'value': 'edit',
- 'type': 'hidden'
- } ),
- $( '<input>' ).attr( {
- 'name':
'veswitched',
- 'value': 1,
- 'type': 'hidden'
- } ),
- $( '<input>' ).attr( {
- 'name': 'title',
- 'value':
target.pageName,
- 'type': 'hidden'
- } )
- ).appendTo( 'body' ).submit();
+ window.location.href =
target.viewUri.clone().extend( {
+ 'action': 'edit',
+ 'veswitched': 1
+ } ).toString();
}
},
function () {
@@ -1126,8 +1122,9 @@
.click( this.onViewTabClick.bind( this ) );
$( '#ca-viewsource, #ca-edit' ).click( function ( e ) {
+ viewPageTarget.editSource();
+
if (
viewPageTarget.surface.getModel().hasBeenModified() ) {
- viewPageTarget.editSource();
e.preventDefault();
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/147646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1efc40f14fca0f743df699a4f3aadd4ba3a249e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
