jenkins-bot has submitted this change and it was merged.
Change subject: Fix vewhitelist override.
......................................................................
Fix vewhitelist override.
This is mainly used for testing blacklisted browsers, so we just need
one parameter ('vewhitelist') which sets whitelist to true and
blacklist to false.
Change-Id: I38771ba7a49657d67c4d94ace1f30b5e41904df6
---
M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 4 insertions(+), 6 deletions(-)
Approvals:
Catrope: Looks good to me, approved
Matmarex: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
index 904982c..a7a4734 100644
--- a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
@@ -74,14 +74,12 @@
this.tabLayout = mw.config.get( 'wgVisualEditorConfig' ).tabLayout;
browserWhitelisted = (
- currentUri.query.vewhitelist !== undefined ?
- currentUri.query.vewhitelist === '1' :
- $.client.test(
ve.init.mw.ViewPageTarget.compatibility.whitelist, null, true )
+ 'vewhitelist' in currentUri.query ||
+ $.client.test(
ve.init.mw.ViewPageTarget.compatibility.whitelist, null, true )
);
browserBlacklisted = (
- currentUri.query.veblacklist !== undefined ?
- currentUri.query.veblacklist === '1' :
- $.client.test(
ve.init.mw.ViewPageTarget.compatibility.blacklist, null, true )
+ !( 'vewhitelist' in currentUri.query ) &&
+ $.client.test(
ve.init.mw.ViewPageTarget.compatibility.blacklist, null, true )
);
// Events
--
To view, visit https://gerrit.wikimedia.org/r/67359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38771ba7a49657d67c4d94ace1f30b5e41904df6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Matmarex <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
