jenkins-bot has submitted this change and it was merged.
Change subject: Hide wikitext warning notification when the user removes the
markup
......................................................................
Hide wikitext warning notification when the user removes the markup
Bug: 51701
Change-Id: I2b24b91175768334c5111bf8e550be9c34c12f69
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 11 insertions(+), 6 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
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 2bfcafc..d1e37c2 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -657,13 +657,16 @@
ve.init.mw.ViewPageTarget.prototype.checkForWikitextWarning = function () {
var text, doc = this.surface.getView().getDocument(),
selection = this.surface.getModel().getSelection(),
- node = doc.getNodeFromOffset( selection.start );
+ node = doc.getNodeFromOffset( selection.start ),
+ textMatches,
+ viewPageTarget = this;
if ( !( node instanceof ve.ce.ContentBranchNode ) ) {
return;
}
text = ve.ce.getDomText( node.$element[0] );
+ textMatches = text.match( /\[\[|\{\{|''|<nowiki|<ref|~~~|^==|^\*|^\#/ );
- if ( text.match( /\[\[|\{\{|''|<nowiki|<ref|~~~|^==|^\*|^\#/ ) ) {
+ if ( textMatches && !this.wikitextWarning ) {
mw.notify(
$( $.parseHTML( ve.init.platform.getParsedMessage(
'visualeditor-wikitext-warning' ) ) )
.filter( 'a' ).attr( 'target', '_blank' ).end(),
@@ -672,10 +675,12 @@
'tag': 'visualeditor-wikitext-warning',
'autoHide': false
}
- );
- this.surface.getModel().disconnect(
- this, { 'documentUpdate': 'checkForWikitextWarning' }
- );
+ ).done( function ( notif ) {
+ viewPageTarget.wikitextWarning = notif;
+ } );
+ } else if ( !textMatches && this.wikitextWarning ) {
+ this.wikitextWarning.close();
+ this.wikitextWarning = undefined;
}
};
--
To view, visit https://gerrit.wikimedia.org/r/110295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b24b91175768334c5111bf8e550be9c34c12f69
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
