[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: Extracted functions in form initialization code

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375944 )

Change subject: Extracted functions in form initialization code
......................................................................

Extracted functions in form initialization code

Change-Id: Ida21865af65d88919879097876e861a97a537635
---
M modules/ext.advancedSearch.init.js
1 file changed, 31 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdvancedSearch 
refs/changes/44/375944/1

diff --git a/modules/ext.advancedSearch.init.js 
b/modules/ext.advancedSearch.init.js
index b4a2def..0cf538b 100644
--- a/modules/ext.advancedSearch.init.js
+++ b/modules/ext.advancedSearch.init.js
@@ -340,20 +340,41 @@
 
        $searchField.val( mw.util.getParamValue( 
'advancedSearchOption-original' ) );
 
+       function createWidget( option ) {
+        var initializationFunction = option.init ||
+                       function () {
+                return new mw.libs.advancedSearch.ui.TextInput(
+                       state,
+                                       {
+                                               id: 'advancedSearchOption-' + 
option.id,
+                                               optionId: option.id
+                       }
+                               );
+            };
+
+               return initializationFunction();
+       }
+
+       function createLayout( option, widget ) {
+        if ( option.layout ) {
+            return option.layout( widget, option );
+        }
+
+        return new OO.ui.FieldLayout(
+               widget,
+                       {
+                               label: mw.msg( 'advancedsearch-field-' + 
option.id ),
+                               align: 'right'
+               }
+               );
+       }
+
        advancedOptions.forEach( function ( option ) {
                if ( option.enabled && !option.enabled() ) {
                        return;
                }
 
-               var paramName = 'advancedSearchOption-' + option.id;
-
-               var widgetInit = option.init || function () {
-                               return new mw.libs.advancedSearch.ui.TextInput( 
state, {
-                                       id: paramName,
-                                       optionId: option.id
-                               } );
-                       },
-                       widget = widgetInit();
+               var widget = createWidget( option );
 
                if ( !option.customEventHandling ) {
                        widget.on( 'change', createMultiSelectChangeHandler( 
option.id ) );
@@ -365,16 +386,7 @@
                        } );
                }
 
-               var layout;
-               if ( option.layout ) {
-                       layout = option.layout( widget, option );
-               } else {
-                       layout = new OO.ui.FieldLayout( widget, {
-                               label: mw.msg( 'advancedsearch-field-' + 
option.id ),
-                               align: 'right'
-                       } );
-               }
-               optionSets[ option.group ].addItems( [ layout ] );
+               optionSets[ option.group ].addItems( [ createLayout( option, 
widget ) ] );
        } );
 
        var $allOptions = $( '<div>' ).prop( { 'class': 
'mw-advancedSearch-fieldContainer' } );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida21865af65d88919879097876e861a97a537635
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>

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