jenkins-bot has submitted this change and it was merged.
Change subject: Check for venotify on page load, not when VPT is created
......................................................................
Check for venotify on page load, not when VPT is created
Not sure what could have broken this or when. Or if it ever worked to be
honest...
Bug: T58921
Change-Id: I069b5ccb4a78a6790e5791354402503676faa7fa
---
M VisualEditor.php
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
3 files changed, 19 insertions(+), 16 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index df108ac..996de49 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -182,6 +182,9 @@
'tooltip-ca-editsource',
'tooltip-ca-ve-edit',
'visualeditor-ca-editsource-section',
+ 'postedit-confirmation-created',
+ 'postedit-confirmation-restored',
+ 'postedit-confirmation-saved',
),
'position' => 'top',
),
@@ -232,9 +235,6 @@
'summary-preview',
// Messages needed by VE in init phase only (rest go
below)
- 'postedit-confirmation-created',
- 'postedit-confirmation-restored',
- 'postedit-confirmation-saved',
'visualeditor-loadwarning',
'visualeditor-loadwarning-token',
'visualeditor-savedialog-identify-anon',
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 05b4263..5efaae8 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -474,9 +474,12 @@
}
$( function () {
+ var currentUri = new mw.Uri( location.href ),
+ isSection;
+
if ( init.isAvailable ) {
if ( isViewPage && uri.query.veaction === 'edit' ) {
- var isSection = uri.query.vesection !==
undefined;
+ isSection = uri.query.vesection !== undefined;
init.showLoading();
ve.track( 'mwedit.init', { type: isSection ?
'section' : 'page', mechanism: 'url' } );
@@ -493,5 +496,17 @@
if ( userPrefEnabled ) {
init.setupSkin();
}
+
+ if ( currentUri.query.venotify ) {
+ // The following messages can be used here:
+ // postedit-confirmation-saved
+ // postedit-confirmation-created
+ // postedit-confirmation-restored
+ mw.hook( 'postEdit' ).fire( {
+ message: mw.msg( 'postedit-confirmation-' +
currentUri.query.venotify, mw.user )
+ } );
+
+ delete currentUri.query.venotify;
+ }
} );
}() );
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 cd1c625..f1b3da9 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -98,18 +98,6 @@
sanityCheckComplete: 'updateToolbarSaveButtonState'
} );
- if ( currentUri.query.venotify ) {
- // The following messages can be used here:
- // postedit-confirmation-saved
- // postedit-confirmation-created
- // postedit-confirmation-restored
- mw.hook( 'postEdit' ).fire( {
- message: ve.msg( 'postedit-confirmation-' +
currentUri.query.venotify, mw.user )
- } );
-
- delete currentUri.query.venotify;
- }
-
if ( history.replaceState ) {
// This is to stop the back button breaking when it's supposed
to take us back out
// of VE. It used to only be called when venotify is used.
FIXME: there should be
--
To view, visit https://gerrit.wikimedia.org/r/186318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I069b5ccb4a78a6790e5791354402503676faa7fa
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
