wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 03:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Make meta dialog tools visibile but disabled in NWE"

Browse source
This commit is contained in:
jenkins-bot 2016-10-27 22:14:08 +00:00 committed by Gerrit Code Review
parent 7d227035d8 fad3b429c8
commit db9d2e3cf5
2 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
View file

@ -192,12 +192,9 @@ ve.init.mw.DesktopWikitextArticleTarget.prototype.setupToolbar = function ( surf
ve.init.mw.DesktopWikitextArticleTarget.super.prototype.setupToolbar.apply( this, arguments );
if ( this.mode === 'source' ) {
/* HACK: Hide meta dialog tools as they aren't supported (yet?) */
// HACK: Replace source button with VE button. This should be via the registry,
// or we should have a toggle tool.
actionGroups = ve.copy( this.constructor.static.actionGroups );
actionGroups[ 1 ].include = OO.simpleArrayDifference(
actionGroups[ 1 ].include,
[ 'meta', 'settings', 'advancedSettings', 'categories', 'languages' ]
);
actionGroups[ 2 ].include[ 0 ] = 'editModeVisual';
this.getActions().setup( actionGroups, surface );
}

40
modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js
View file

@ -5,11 +5,31 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
/**
* MediaWiki UserInterface VE only dialog tool.
*
* @class
* @abstract
* @extends ve.ui.WindowTool
* @constructor
*/
ve.ui.MWVeOnlyDialogTool = function VeUiMWMetaDialogTool() {
ve.ui.MWVeOnlyDialogTool.super.apply( this, arguments );
};
OO.inheritClass( ve.ui.MWVeOnlyDialogTool, ve.ui.WindowTool );
ve.ui.MWVeOnlyDialogTool.prototype.onUpdateState = function () {
// Parent method
ve.ui.MWVeOnlyDialogTool.super.prototype.onUpdateState.apply( this, arguments );
// Meta tools are not supported in source mode (yet?)
this.setDisabled( ve.init.target.mode === 'source' );
};
/**
* MediaWiki UserInterface meta dialog tool.
*
* @class
* @extends ve.ui.WindowTool
* @extends ve.ui.MWVeOnlyDialogTool
* @constructor
* @param {OO.ui.Toolbar} toolbar
* @param {Object} [config] Configuration options
@ -17,7 +37,7 @@
ve.ui.MWMetaDialogTool = function VeUiMWMetaDialogTool() {
ve.ui.MWMetaDialogTool.super.apply( this, arguments );
};
OO.inheritClass( ve.ui.MWMetaDialogTool, ve.ui.WindowTool );
OO.inheritClass( ve.ui.MWMetaDialogTool, ve.ui.MWVeOnlyDialogTool );
ve.ui.MWMetaDialogTool.static.name = 'meta';
ve.ui.MWMetaDialogTool.static.group = 'utility';
ve.ui.MWMetaDialogTool.static.icon = 'window';
@ -39,7 +59,7 @@ ve.ui.commandRegistry.register(
* MediaWiki UserInterface page settings tool.
*
* @class
* @extends ve.ui.WindowTool
* @extends ve.ui.MWVeOnlyDialogTool
* @constructor
* @param {OO.ui.Toolbar} toolbar
* @param {Object} [config] Configuration options
@ -47,7 +67,7 @@ ve.ui.commandRegistry.register(
ve.ui.MWPageSettingsDialogTool = function VeUiMWPageSettingsDialogTool() {
ve.ui.MWPageSettingsDialogTool.super.apply( this, arguments );
};
OO.inheritClass( ve.ui.MWPageSettingsDialogTool, ve.ui.WindowTool );
OO.inheritClass( ve.ui.MWPageSettingsDialogTool, ve.ui.MWVeOnlyDialogTool );
ve.ui.MWPageSettingsDialogTool.static.name = 'settings';
ve.ui.MWPageSettingsDialogTool.static.group = 'utility';
ve.ui.MWPageSettingsDialogTool.static.icon = 'settings';
@ -69,7 +89,7 @@ ve.ui.commandRegistry.register(
* MediaWiki UserInterface advanced page settings tool.
*
* @class
* @extends ve.ui.WindowTool
* @extends ve.ui.MWVeOnlyDialogTool
* @constructor
* @param {OO.ui.Toolbar} toolbar
* @param {Object} [config] Configuration options
@ -77,7 +97,7 @@ ve.ui.commandRegistry.register(
ve.ui.MWAdvancedPageSettingsDialogTool = function VeUiMWAdvancedPageSettingsDialogTool() {
ve.ui.MWAdvancedPageSettingsDialogTool.super.apply( this, arguments );
};
OO.inheritClass( ve.ui.MWAdvancedPageSettingsDialogTool, ve.ui.WindowTool );
OO.inheritClass( ve.ui.MWAdvancedPageSettingsDialogTool, ve.ui.MWVeOnlyDialogTool );
ve.ui.MWAdvancedPageSettingsDialogTool.static.name = 'advancedSettings';
ve.ui.MWAdvancedPageSettingsDialogTool.static.group = 'utility';
ve.ui.MWAdvancedPageSettingsDialogTool.static.icon = 'advanced';
@ -99,7 +119,7 @@ ve.ui.commandRegistry.register(
* MediaWiki UserInterface categories tool.
*
* @class
* @extends ve.ui.WindowTool
* @extends ve.ui.MWVeOnlyDialogTool
* @constructor
* @param {OO.ui.Toolbar} toolbar
* @param {Object} [config] Configuration options
@ -107,7 +127,7 @@ ve.ui.commandRegistry.register(
ve.ui.MWCategoriesDialogTool = function VeUiMWCategoriesDialogTool() {
ve.ui.MWCategoriesDialogTool.super.apply( this, arguments );
};
OO.inheritClass( ve.ui.MWCategoriesDialogTool, ve.ui.WindowTool );
OO.inheritClass( ve.ui.MWCategoriesDialogTool, ve.ui.MWVeOnlyDialogTool );
ve.ui.MWCategoriesDialogTool.static.name = 'categories';
ve.ui.MWCategoriesDialogTool.static.group = 'utility';
ve.ui.MWCategoriesDialogTool.static.icon = 'tag';
@ -129,7 +149,7 @@ ve.ui.commandRegistry.register(
* MediaWiki UserInterface languages tool.
*
* @class
* @extends ve.ui.WindowTool
* @extends ve.ui.MWVeOnlyDialogTool
* @constructor
* @param {OO.ui.Toolbar} toolbar
* @param {Object} [config] Configuration options
@ -137,7 +157,7 @@ ve.ui.commandRegistry.register(
ve.ui.MWLanguagesDialogTool = function VeUiMWLanguagesDialogTool() {
ve.ui.MWLanguagesDialogTool.super.apply( this, arguments );
};
OO.inheritClass( ve.ui.MWLanguagesDialogTool, ve.ui.WindowTool );
OO.inheritClass( ve.ui.MWLanguagesDialogTool, ve.ui.MWVeOnlyDialogTool );
ve.ui.MWLanguagesDialogTool.static.name = 'languages';
ve.ui.MWLanguagesDialogTool.static.group = 'utility';
ve.ui.MWLanguagesDialogTool.static.icon = 'textLanguage';