jenkins-bot has submitted this change and it was merged.

Change subject: SelectWidget: Optimize #getRelativeSelectableItem without filter
......................................................................


SelectWidget: Optimize #getRelativeSelectableItem without filter

Avoid function calls when no 'filter' was given.

Change-Id: I79d3734bc1ad6bee24a1617db44583c66df4de1c
---
M src/widgets/SelectWidget.js
1 file changed, 4 insertions(+), 10 deletions(-)

Approvals:
  Jforrester: Looks good to me, but someone else must approve
  Esanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index 71efc0a..c2bec1c 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -90,11 +90,6 @@
 OO.mixinClass( OO.ui.SelectWidget, OO.ui.mixin.GroupElement );
 OO.mixinClass( OO.ui.SelectWidget, OO.ui.mixin.GroupWidget );
 
-/* Static */
-OO.ui.SelectWidget.static.passAllFilter = function () {
-       return true;
-};
-
 /* Events */
 
 /**
@@ -747,10 +742,6 @@
                increase = direction > 0 ? 1 : -1,
                len = this.items.length;
 
-       if ( !$.isFunction( filter ) ) {
-               filter = OO.ui.SelectWidget.static.passAllFilter;
-       }
-
        if ( item instanceof OO.ui.OptionWidget ) {
                currentIndex = this.items.indexOf( item );
                nextIndex = ( currentIndex + increase + len ) % len;
@@ -762,7 +753,10 @@
 
        for ( i = 0; i < len; i++ ) {
                item = this.items[ nextIndex ];
-               if ( item instanceof OO.ui.OptionWidget && item.isSelectable() 
&& filter( item ) ) {
+               if (
+                       item instanceof OO.ui.OptionWidget && 
item.isSelectable() &&
+                       ( !filter || filter( item ) )
+               ) {
                        return item;
                }
                nextIndex = ( nextIndex + increase + len ) % len;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79d3734bc1ad6bee24a1617db44583c66df4de1c
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz DziewoƄski <[email protected]>
Gerrit-Reviewer: Esanders <[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

Reply via email to