jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365244 )
Change subject: VisualEditor: Rollback of change 364988
......................................................................
VisualEditor: Rollback of change 364988
Seems that in some special case when mixed with tables, this change also
breaks the text in another way.
Change-Id: Ia45a17875cfeb589719c7bddfd32eebca9a56019
ERM: #6826, #6743
---
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Pwirth: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
index 7464a03..8ec0ea5 100644
--- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
+++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
@@ -1812,7 +1812,7 @@
specialTagsList =
mw.config.get('BsVisualEditorConfigDefault').specialtaglist;
// Tags without innerHTML need /> as end marker. Maybe this
should be task of a preprocessor, in order to allow mw style tags without /.
- regex = '<(' + specialTagsList + ')(
*[^>]*)*?((\\s\\/>)|(\\/>)|(>([\\S\\s]*?((<\\/\\1>)|(<\\/ \\1>)))))';
+ regex = '<(' + specialTagsList + ')(
[^>]*)*?((\\s\\/>)|(\\/>)|(>([\\S\\s]*?((<\\/\\1>)|(<\\/ \\1>)))))';
matcher = new RegExp(regex, 'gmi');
mtext = text;
--
To view, visit https://gerrit.wikimedia.org/r/365244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia45a17875cfeb589719c7bddfd32eebca9a56019
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: ItSpiderman <d.savulje...@gmail.com>
Gerrit-Reviewer: Ljonka <l.verhovs...@gmail.com>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
