jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (5003907)
......................................................................
Update VE core submodule to master (5003907)
New changes:
7b68782 Update OOjs UI to v0.1.0-pre (3b434d5388)
ecb194d Remove border-radius prefixes
993220a Fix invalid use of border shorthand syntax
580473e build: Clean up repo split left overs in Gruntfile
Incidental change:
* The OOjs UI-provided 'autoAdd' configuration option for tools has been
replaced with 'autoAddToCatchall' and 'autoAddToGroup'.
Change-Id: Ie7646ae867e5c6ca616c3f9045c79b886e78475c
---
M lib/ve
M modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
M modules/ve-mw/ui/tools/ve.ui.MWDialogTool.js
M modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
M modules/ve-mw/ui/tools/ve.ui.MWMediaDialogTool.js
M modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js
M modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
7 files changed, 24 insertions(+), 11 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ve b/lib/ve
index 04d67d2..5003907 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 04d67d2ec817e6f9d8c983570f6080ee7acd1110
+Subproject commit 500390762265271d07f393f5d6ffb508ead61174
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
b/modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
index 1f5ff5a..44963fd 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
@@ -25,5 +25,6 @@
OO.ui.deferMsg( 'visualeditor-mwalienextensioninspector-title' );
ve.ui.MWAlienExtensionInspectorTool.static.inspector = 'alienExtension';
ve.ui.MWAlienExtensionInspectorTool.static.modelClasses = [
ve.dm.MWAlienExtensionNode ];
-ve.ui.MWAlienExtensionInspectorTool.static.autoAdd = false;
+ve.ui.MWAlienExtensionInspectorTool.static.autoAddToCatchall = false;
+ve.ui.MWAlienExtensionInspectorTool.static.autoAddToGroup = false;
ve.ui.toolFactory.register( ve.ui.MWAlienExtensionInspectorTool );
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWDialogTool.js
b/modules/ve-mw/ui/tools/ve.ui.MWDialogTool.js
index d66493f..ef911e2 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWDialogTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWDialogTool.js
@@ -24,5 +24,6 @@
ve.ui.MWCommandHelpDialogTool.static.title =
OO.ui.deferMsg( 'visualeditor-dialog-command-help-title' );
ve.ui.MWCommandHelpDialogTool.static.dialog = 'commandHelp';
-ve.ui.MWCommandHelpDialogTool.static.autoAdd = false;
+ve.ui.MWCommandHelpDialogTool.static.autoAddToCatchall = false;
+ve.ui.MWCommandHelpDialogTool.static.autoAddToGroup = false;
ve.ui.toolFactory.register( ve.ui.MWCommandHelpDialogTool );
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
b/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
index 7490e82..e94b5da 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
@@ -26,7 +26,10 @@
/* Static Properties */
ve.ui.MWEditModeTool.static.group = 'editMode';
-ve.ui.MWEditModeTool.static.autoAdd = false;
+
+ve.ui.MWEditModeTool.static.autoAddToCatchall = false;
+
+ve.ui.MWEditModeTool.static.autoAddToGroup = false;
/* Methods */
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWMediaDialogTool.js
b/modules/ve-mw/ui/tools/ve.ui.MWMediaDialogTool.js
index d9e1335..4fd193e 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWMediaDialogTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWMediaDialogTool.js
@@ -25,7 +25,8 @@
OO.ui.deferMsg( 'visualeditor-dialogbutton-media-tooltip' );
ve.ui.MWMediaEditDialogTool.static.dialog = 'mediaEdit';
ve.ui.MWMediaEditDialogTool.static.modelClasses = [ ve.dm.MWBlockImageNode ];
-ve.ui.MWMediaEditDialogTool.static.autoAdd = false;
+ve.ui.MWMediaEditDialogTool.static.autoAddToCatchall = false;
+ve.ui.MWMediaEditDialogTool.static.autoAddToGroup = false;
ve.ui.toolFactory.register( ve.ui.MWMediaEditDialogTool );
/**
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js
b/modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js
index c861d6d..630f84b 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js
@@ -24,7 +24,8 @@
ve.ui.MWMetaDialogTool.static.title =
OO.ui.deferMsg( 'visualeditor-meta-tool' );
ve.ui.MWMetaDialogTool.static.dialog = 'meta';
-ve.ui.MWMetaDialogTool.static.autoAdd = false;
+ve.ui.MWMetaDialogTool.static.autoAddToCatchall = false;
+ve.ui.MWMetaDialogTool.static.autoAddToGroup = false;
ve.ui.toolFactory.register( ve.ui.MWMetaDialogTool );
/**
@@ -47,7 +48,8 @@
OO.ui.deferMsg( 'visualeditor-settings-tool' );
ve.ui.MWPageSettingsDialogTool.static.dialog = 'meta';
ve.ui.MWPageSettingsDialogTool.static.dialogData = { 'page': 'settings' };
-ve.ui.MWPageSettingsDialogTool.static.autoAdd = false;
+ve.ui.MWPageSettingsDialogTool.static.autoAddToCatchall = false;
+ve.ui.MWPageSettingsDialogTool.static.autoAddToGroup = false;
ve.ui.toolFactory.register( ve.ui.MWPageSettingsDialogTool );
/**
@@ -70,7 +72,8 @@
OO.ui.deferMsg( 'visualeditor-advancedsettings-tool' );
ve.ui.MWAdvancedPageSettingsDialogTool.static.dialog = 'meta';
ve.ui.MWAdvancedPageSettingsDialogTool.static.dialogData = { 'page':
'advancedSettings' };
-ve.ui.MWAdvancedPageSettingsDialogTool.static.autoAdd = false;
+ve.ui.MWAdvancedPageSettingsDialogTool.static.autoAddToCatchall = false;
+ve.ui.MWAdvancedPageSettingsDialogTool.static.autoAddToGroup = false;
ve.ui.toolFactory.register( ve.ui.MWAdvancedPageSettingsDialogTool );
/**
@@ -93,7 +96,8 @@
OO.ui.deferMsg( 'visualeditor-categories-tool' );
ve.ui.MWCategoriesDialogTool.static.dialog = 'meta';
ve.ui.MWCategoriesDialogTool.static.dialogData = { 'page': 'categories' };
-ve.ui.MWCategoriesDialogTool.static.autoAdd = false;
+ve.ui.MWCategoriesDialogTool.static.autoAddToCatchall = false;
+ve.ui.MWCategoriesDialogTool.static.autoAddToGroup = false;
ve.ui.toolFactory.register( ve.ui.MWCategoriesDialogTool );
/**
@@ -116,5 +120,6 @@
OO.ui.deferMsg( 'visualeditor-languages-tool' );
ve.ui.MWLanguagesDialogTool.static.dialog = 'meta';
ve.ui.MWLanguagesDialogTool.static.dialogData = { 'page': 'languages' };
-ve.ui.MWLanguagesDialogTool.static.autoAdd = false;
+ve.ui.MWLanguagesDialogTool.static.autoAddToCatchall = false;
+ve.ui.MWLanguagesDialogTool.static.autoAddToGroup = false;
ve.ui.toolFactory.register( ve.ui.MWLanguagesDialogTool );
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
b/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
index 9985ec9..f4da44b 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
@@ -63,7 +63,8 @@
ve.ui.MWNoticesPopupTool.static.group = 'utility';
ve.ui.MWNoticesPopupTool.static.icon = 'alert';
ve.ui.MWNoticesPopupTool.static.title = OO.ui.deferMsg(
'visualeditor-editnotices-tooltip' );
-ve.ui.MWNoticesPopupTool.static.autoAdd = false;
+ve.ui.MWNoticesPopupTool.static.autoAddToCatchall = false;
+ve.ui.MWNoticesPopupTool.static.autoAddToGroup = false;
/* Methods */
@@ -173,7 +174,8 @@
ve.ui.MWHelpPopupTool.static.group = 'utility';
ve.ui.MWHelpPopupTool.static.icon = 'help';
ve.ui.MWHelpPopupTool.static.title = OO.ui.deferMsg( 'visualeditor-help-tool'
);
-ve.ui.MWHelpPopupTool.static.autoAdd = false;
+ve.ui.MWHelpPopupTool.static.autoAddToCatchall = false;
+ve.ui.MWHelpPopupTool.static.autoAddToGroup = false;
/* Methods */
--
To view, visit https://gerrit.wikimedia.org/r/120051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7646ae867e5c6ca616c3f9045c79b886e78475c
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
