jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393949 )
Change subject: ui.ArbitraryWordInput: Use util.arrayEquals() instead of a
duplicate
......................................................................
ui.ArbitraryWordInput: Use util.arrayEquals() instead of a duplicate
Also fix dependencies on the 'ext.advancedSearch.util' module in
extension.json. It was added as a dependency in a few modules that
don't use its only function, and was missing in the only module that
actually uses it. (None of this matters anyway because the modules
are never loaded separately.)
Change-Id: I6f8b5e547fe75f896ddbf91b0f0ad69908ef289c
---
M extension.json
M modules/ui/ext.advancedSearch.ArbitraryWordInput.js
2 files changed, 5 insertions(+), 21 deletions(-)
Approvals:
WMDE-Fisch: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index ee4d4e4..fe2ce82 100644
--- a/extension.json
+++ b/extension.json
@@ -80,7 +80,6 @@
"oojs-ui.styles.icons-media",
"oojs-ui.styles.icons-user",
"oojs-ui.styles.icons-wikimedia",
- "ext.advancedSearch.util",
"ext.advancedSearch.dm.SearchModel",
"ext.advancedSearch.dm.FileTypeOptionProvider",
"ext.advancedSearch.dm.trackingEvents.SearchRequest",
@@ -103,6 +102,7 @@
"modules/ui/ext.advancedSearch.ArbitraryWordInput.js"
],
"dependencies": [
+ "ext.advancedSearch.util",
"oojs-ui-widgets"
]
},
@@ -162,7 +162,6 @@
"modules/ui/ext.advancedSearch.NamespaceFilters.js"
],
"dependencies": [
- "ext.advancedSearch.util",
"oojs-ui-widgets"
]
},
@@ -171,6 +170,7 @@
"modules/ui/ext.advancedSearch.NamespacePresets.js"
],
"dependencies": [
+ "ext.advancedSearch.util",
"oojs-ui-widgets"
]
},
@@ -216,8 +216,7 @@
"modules/dm/ext.advancedSearch.SearchModel.js"
],
"dependencies": [
- "oojs-ui-widgets",
- "ext.advancedSearch.util"
+ "oojs-ui-widgets"
]
},
"ext.advancedSearch.dm.FileTypeOptionProvider": {
@@ -225,8 +224,7 @@
"modules/dm/ext.advancedSearch.FileTypeOptionProvider.js"
],
"dependencies": [
- "oojs-ui-widgets",
- "ext.advancedSearch.util"
+ "oojs-ui-widgets"
]
},
"ext.advancedSearch.dm.trackingEvents.SearchRequest": {
diff --git a/modules/ui/ext.advancedSearch.ArbitraryWordInput.js
b/modules/ui/ext.advancedSearch.ArbitraryWordInput.js
index 7062b29..30e2813 100644
--- a/modules/ui/ext.advancedSearch.ArbitraryWordInput.js
+++ b/modules/ui/ext.advancedSearch.ArbitraryWordInput.js
@@ -41,22 +41,8 @@
OO.inheritClass( mw.libs.advancedSearch.ui.ArbitraryWordInput,
OO.ui.TagMultiselectWidget );
mw.libs.advancedSearch.ui.ArbitraryWordInput.prototype.populateFromStore =
function () {
- // TODO move to util module
- function arrayEquals( a1, a2 ) {
- var i = a1.length;
- if ( a1.length !== a2.length ) {
- return false;
- }
- while ( i-- ) {
- if ( a1[ i ] !== a2[ i ] ) {
- return false;
- }
- }
- return true;
- }
-
var val = this.store.getOption( this.optionId ) || [];
- if ( arrayEquals( this.getValue(), val ) ) {
+ if ( mw.libs.advancedSearch.util.arrayEquals( this.getValue(),
val ) ) {
return;
}
this.setValue( val );
--
To view, visit https://gerrit.wikimedia.org/r/393949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f8b5e547fe75f896ddbf91b0f0ad69908ef289c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
