jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405664 )
Change subject: Use ve.dm.MetaList without explicitly requiring metadata index
......................................................................
Use ve.dm.MetaList without explicitly requiring metadata index
For future compatibility with Ib5174b0dcba1c24f44d889e08140bee31a064011 .
Change-Id: I15f252ce5d36bc0c38c5f5035e5176bf5e6d96e5
---
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
1 file changed, 11 insertions(+), 19 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
index 8d277f9..d59200f 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
@@ -107,16 +107,16 @@
* or undefined to go at the end
*/
ve.ui.MWCategoriesPage.prototype.onNewCategory = function ( item,
beforeMetaItem ) {
+ var args = [ this.getCategoryItemForInsertion( item ) ];
+
// Insert new metaList item
if ( beforeMetaItem ) {
- this.insertMetaListItem(
- this.getCategoryItemForInsertion( item ),
- beforeMetaItem.getOffset(),
- beforeMetaItem.getIndex()
- );
- } else {
- this.insertMetaListItem( this.getCategoryItemForInsertion( item
) );
+ args.push( beforeMetaItem.getOffset() );
+ if ( beforeMetaItem.getIndex ) {
+ args.push( beforeMetaItem.getIndex() );
+ }
}
+ this.metaList.insertMeta.apply( this.metaList, args );
};
/**
@@ -135,11 +135,14 @@
* @param {ve.dm.MetaItem} metaItem
*/
ve.ui.MWCategoriesPage.prototype.onMetaListInsert = function ( metaItem ) {
+ var index;
+
// Responsible for adding UI components
if ( metaItem.element.type === 'mwCategory' ) {
+ index = this.metaList.getItemsInGroup( 'mwCategory' ).indexOf(
metaItem );
this.categoryWidget.addItems(
[ this.getCategoryItemFromMetaListItem( metaItem ) ],
- this.metaList.findItem( metaItem.getOffset(),
metaItem.getIndex(), 'mwCategory' )
+ index
);
}
};
@@ -219,17 +222,6 @@
return ve.extendObject( {}, oldData, newData );
}
return newData;
-};
-
-/**
- * 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
- */
-ve.ui.MWCategoriesPage.prototype.insertMetaListItem = function ( metaBase,
offset, index ) {
- this.metaList.insertMeta( metaBase, offset, index );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/405664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I15f252ce5d36bc0c38c5f5035e5176bf5e6d96e5
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
