[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: dm.metaitems: Turn grouped metas into variadic ones

2017-04-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/346933 )

Change subject: dm.metaitems: Turn grouped metas into variadic ones
..


dm.metaitems: Turn grouped metas into variadic ones

We're getting rid of meta item grouping, so we need to prepare.

Merged:
* ve.dm.MWIndexMetaItem
  from ve.dm.MWIndexDisableMetaItem and ve.dm.MWIndexForceMetaItem
* ve.dm.MWNewSectionEditMetaItem
  from ve.dm.MWNewSectionEditDisableMetaItem and 
ve.dm.MWNewSectionEditForceMetaItem
* ve.dm.MWTOCMetaItem
  from ve.dm.MWTOCDisableMetaItem and ve.dm.MWTOCForceMetaItem

These three now inherit from ve.dm.MWFlaggedMetaItem to avoid code duplication.

Change-Id: Ic8a9cdb1226dccac2c27e7f4b965c1590a7387c0
---
M extension.json
A modules/ve-mw/dm/metaitems/ve.dm.MWFlaggedMetaItem.js
D modules/ve-mw/dm/metaitems/ve.dm.MWIndexDisableMetaItem.js
D modules/ve-mw/dm/metaitems/ve.dm.MWIndexForceMetaItem.js
A modules/ve-mw/dm/metaitems/ve.dm.MWIndexMetaItem.js
D modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditDisableMetaItem.js
D modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditForceMetaItem.js
A modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditMetaItem.js
D modules/ve-mw/dm/metaitems/ve.dm.MWTOCDisableMetaItem.js
D modules/ve-mw/dm/metaitems/ve.dm.MWTOCForceMetaItem.js
A modules/ve-mw/dm/metaitems/ve.dm.MWTOCMetaItem.js
M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
13 files changed, 206 insertions(+), 325 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index bb8a032..01856d0 100644
--- a/extension.json
+++ b/extension.json
@@ -1537,19 +1537,17 @@

"modules/ve-mw/dm/metaitems/ve.dm.MWDefaultSortMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWDisplayTitleMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWHiddenCategoryMetaItem.js",
-   
"modules/ve-mw/dm/metaitems/ve.dm.MWIndexDisableMetaItem.js",
-   
"modules/ve-mw/dm/metaitems/ve.dm.MWIndexForceMetaItem.js",
+   
"modules/ve-mw/dm/metaitems/ve.dm.MWFlaggedMetaItem.js",
+   
"modules/ve-mw/dm/metaitems/ve.dm.MWIndexMetaItem.js",
+   
"modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditMetaItem.js",
+   
"modules/ve-mw/dm/metaitems/ve.dm.MWTOCMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWLanguageMetaItem.js",
-   
"modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditDisableMetaItem.js",
-   
"modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditForceMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWNoContentConvertMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWNoEditSectionMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWNoGalleryMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWNoTitleConvertMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWRedirectMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWStaticRedirectMetaItem.js",
-   
"modules/ve-mw/dm/metaitems/ve.dm.MWTOCDisableMetaItem.js",
-   
"modules/ve-mw/dm/metaitems/ve.dm.MWTOCForceMetaItem.js",

"modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js",

"modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js",

"modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js",
diff --git a/modules/ve-mw/dm/metaitems/ve.dm.MWFlaggedMetaItem.js 
b/modules/ve-mw/dm/metaitems/ve.dm.MWFlaggedMetaItem.js
new file mode 100644
index 000..d04011e
--- /dev/null
+++ b/modules/ve-mw/dm/metaitems/ve.dm.MWFlaggedMetaItem.js
@@ -0,0 +1,57 @@
+/*!
+ * VisualEditor DataModel MWFlaggedMetaItem class.
+ *
+ * @copyright 2011-2017 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * DataModel flagged meta item abstract (for pairs of meta items).
+ *
+ * @class
+ * @abstract
+ * @extends ve.dm.MetaItem
+ * @constructor
+ * @param {Object} [element] Reference to element in meta-linmod
+ */
+ve.dm.MWFlaggedMetaItem = function VeDmMWFlaggedMetaItem() {
+   // Parent constructor
+   ve.dm.MWFlaggedMetaItem.super.apply( this, arguments );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.dm.MWFlaggedMetaItem, ve.dm.MetaItem );
+
+/* Static Properties */
+
+/* No name/group/matchRdfaTypes, as this is not a valid meta item, just an 
abstract class. */
+

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: dm.metaitems: Turn grouped metas into variadic ones

2017-04-06 Thread Jforrester (Code Review) 
Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346933 )

Change subject: dm.metaitems: Turn grouped metas into variadic ones
..

dm.metaitems: Turn grouped metas into variadic ones

We're getting rid of meta item grouping, so we need to prepare.

Merged:
* ve.dm.MWIndexMetaItem.js
  from ve.dm.MWIndexDisableMetaItem.js and ve.dm.MWIndexForceMetaItem.js
* ve.dm.MWNewSectionEditMetaItem.js
  from ve.dm.MWNewSectionEditDisableMetaItem.js and 
ve.dm.MWNewSectionEditForceMetaItem.js
* ve.dm.MWTOCMetaItem.js
  from ve.dm.MWTOCDisableMetaItem.js and ve.dm.MWTOCForceMetaItem.js

Change-Id: Ic8a9cdb1226dccac2c27e7f4b965c1590a7387c0
---
M extension.json
D modules/ve-mw/dm/metaitems/ve.dm.MWIndexDisableMetaItem.js
D modules/ve-mw/dm/metaitems/ve.dm.MWIndexForceMetaItem.js
A modules/ve-mw/dm/metaitems/ve.dm.MWIndexMetaItem.js
D modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditDisableMetaItem.js
D modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditForceMetaItem.js
A modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditMetaItem.js
D modules/ve-mw/dm/metaitems/ve.dm.MWTOCDisableMetaItem.js
D modules/ve-mw/dm/metaitems/ve.dm.MWTOCForceMetaItem.js
A modules/ve-mw/dm/metaitems/ve.dm.MWTOCMetaItem.js
M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
12 files changed, 229 insertions(+), 325 deletions(-)


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

diff --git a/extension.json b/extension.json
index e6106df..dc5f19c 100644
--- a/extension.json
+++ b/extension.json
@@ -1538,19 +1538,16 @@

"modules/ve-mw/dm/metaitems/ve.dm.MWDefaultSortMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWDisplayTitleMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWHiddenCategoryMetaItem.js",
-   
"modules/ve-mw/dm/metaitems/ve.dm.MWIndexDisableMetaItem.js",
-   
"modules/ve-mw/dm/metaitems/ve.dm.MWIndexForceMetaItem.js",
+   
"modules/ve-mw/dm/metaitems/ve.dm.MWIndexMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWLanguageMetaItem.js",
-   
"modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditDisableMetaItem.js",
-   
"modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditForceMetaItem.js",
+   
"modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWNoContentConvertMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWNoEditSectionMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWNoGalleryMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWNoTitleConvertMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWRedirectMetaItem.js",

"modules/ve-mw/dm/metaitems/ve.dm.MWStaticRedirectMetaItem.js",
-   
"modules/ve-mw/dm/metaitems/ve.dm.MWTOCDisableMetaItem.js",
-   
"modules/ve-mw/dm/metaitems/ve.dm.MWTOCForceMetaItem.js",
+   
"modules/ve-mw/dm/metaitems/ve.dm.MWTOCMetaItem.js",

"modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js",

"modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js",

"modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js",
diff --git a/modules/ve-mw/dm/metaitems/ve.dm.MWIndexDisableMetaItem.js 
b/modules/ve-mw/dm/metaitems/ve.dm.MWIndexDisableMetaItem.js
deleted file mode 100644
index 068b009..000
--- a/modules/ve-mw/dm/metaitems/ve.dm.MWIndexDisableMetaItem.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * VisualEditor DataModel MWIndexDisableMetaItem class.
- *
- * @copyright 2011-2017 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-/**
- * DataModel disable index meta item (for __NOINDEX__).
- *
- * @class
- * @extends ve.dm.MetaItem
- * @constructor
- * @param {Object} element Reference to element in meta-linmod
- */
-ve.dm.MWIndexDisableMetaItem = function VeDmMWIndexDisableMetaItem() {
-   // Parent constructor
-   ve.dm.MWIndexDisableMetaItem.super.apply( this, arguments );
-};
-
-/* Inheritance */
-
-OO.inheritClass( ve.dm.MWIndexDisableMetaItem, ve.dm.MetaItem );
-
-/* Static Properties */
-
-ve.dm.MWIndexDisableMetaItem.static.name = 'mwIndexDisable';
-
-ve.dm.MWIndexDisableMetaItem.static.group = 'mwIndex';
-
-ve.dm.MWIndexDisableMetaItem.static.matchTagNames = [ 'meta' ];
-
-ve.dm.MWIndexDisableMetaItem.static.matchRdfaTypes = [