Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/314040

Change subject: Disable switch-to-VE button in NWE if VE is unavailable, don't 
hide it
......................................................................

Disable switch-to-VE button in NWE if VE is unavailable, don't hide it

Bug: T146182
Change-Id: I9d5095147288a78e2ba7dbddd3d7e6673c97859f
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
1 file changed, 10 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/40/314040/1

diff --git 
a/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
index 84b107d..37687ed 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
@@ -149,11 +149,7 @@
                        actionGroups[ 1 ].include,
                        [ 'meta', 'settings', 'advancedSettings', 'categories', 
'languages' ]
                );
-               if ( mw.libs.ve.isVisualAvailable ) {
-                       actionGroups[ 2 ].include[ 0 ] = 'editModeVisual';
-               } else {
-                       actionGroups[ 2 ].include = [];
-               }
+               actionGroups[ 2 ].include[ 0 ] = 'editModeVisual';
                this.getActions().setup( actionGroups, surface );
        }
 };
@@ -332,4 +328,13 @@
        this.toolbar.getTarget().switchToVisualEditor();
        this.setActive( false );
 };
+/**
+ * @inheritdoc
+ */
+ve.ui.MWEditModeVisualTool.prototype.onUpdateState = function () {
+       // Parent method
+       ve.ui.MWEditModeVisualTool.super.prototype.onUpdateState.apply( this, 
arguments );
+
+       this.setDisabled( !mw.libs.ve.isVisualAvailable );
+};
 ve.ui.toolFactory.register( ve.ui.MWEditModeVisualTool );

-- 
To view, visit https://gerrit.wikimedia.org/r/314040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d5095147288a78e2ba7dbddd3d7e6673c97859f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to