[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use ve.dm.MetaList without explicitly requiring metadata off...

[Divec (Code Review)]

Divec has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405664 )

Change subject: Use ve.dm.MetaList without explicitly requiring metadata 
offset/index
......................................................................

Use ve.dm.MetaList without explicitly requiring metadata offset/index

For future compatibility with Ib5174b0dcba1c24f44d889e08140bee31a064011 .

Change-Id: I15f252ce5d36bc0c38c5f5035e5176bf5e6d96e5
---
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
1 file changed, 14 insertions(+), 13 deletions(-)


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

diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
index 8d277f9..c155613 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
@@ -107,13 +107,12 @@
  *  or undefined to go at the end
  */
 ve.ui.MWCategoriesPage.prototype.onNewCategory = function ( item, 
beforeMetaItem ) {
+       var offset;
+
        // Insert new metaList item
        if ( beforeMetaItem ) {
-               this.insertMetaListItem(
-                       this.getCategoryItemForInsertion( item ),
-                       beforeMetaItem.getOffset(),
-                       beforeMetaItem.getIndex()
-               );
+               offset = beforeMetaItem.getOffset();
+               this.insertMetaListItem( this.getCategoryItemForInsertion( item 
), offset );
        } else {
                this.insertMetaListItem( this.getCategoryItemForInsertion( item 
) );
        }
@@ -135,12 +134,12 @@
  * @param {ve.dm.MetaItem} metaItem
  */
 ve.ui.MWCategoriesPage.prototype.onMetaListInsert = function ( metaItem ) {
+       var index;
+
        // Responsible for adding UI components
        if ( metaItem.element.type === 'mwCategory' ) {
-               this.categoryWidget.addItems(
-                       [ this.getCategoryItemFromMetaListItem( metaItem ) ],
-                       this.metaList.findItem( metaItem.getOffset(), 
metaItem.getIndex(), 'mwCategory' )
-               );
+               index = this.metaList.getItemsForGroup( 'mwCategory' ).indexOf( 
metaItem );
+               this.categoryWidget.addItems( [ metaItem ], index );
        }
 };
 
@@ -225,11 +224,13 @@
  * Inserts a meta list item
  *
  * @param {Object} metaBase meta list insert object
- * @param {number} [offset] Offset of the meta items within the document
- * @param {number} [index] Index of the meta item within the group of meta 
items at this offset
+ * @param {number} [offset] Offset of the meta items within the document; 
default to document end
  */
-ve.ui.MWCategoriesPage.prototype.insertMetaListItem = function ( metaBase, 
offset, index ) {
-       this.metaList.insertMeta( metaBase, offset, index );
+ve.ui.MWCategoriesPage.prototype.insertMetaListItem = function ( metaBase, 
offset ) {
+       if ( arguments.length > 2 ) {
+               throw new Error( 'Old "index" argument is no longer supported' 
);
+       }
+       this.metaList.insertMeta( metaBase, offset );
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15f252ce5d36bc0c38c5f5035e5176bf5e6d96e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec <da...@troi.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits