@@ -86,7 +86,8 @@ define([
8686 if ( this . getSettings ( ) . useStreet2AsHouseNumber ) {
8787 registry . get ( this . parentName + '.street.1' ) . set ( 'value' , formData . experius_postcode_housenumber ) . set ( 'error' , false ) ;
8888 } else {
89- registry . get ( this . parentName + '.street.0' ) . set ( 'value' , formData . street + ' ' + formData . experius_postcode_housenumber ) . set ( 'error' , false ) ;
89+ var street = typeof ( formData . street ) == 'object' ? formData . street [ 0 ] : formData . street ;
90+ registry . get ( this . parentName + '.street.0' ) . set ( 'value' , street + ' ' + formData . experius_postcode_housenumber ) . set ( 'error' , false ) ;
9091 }
9192 }
9293 } else if ( registry . get ( this . parentName + '.experius_postcode_fieldset.experius_postcode_disable' ) . get ( 'visible' ) ) {
@@ -187,17 +188,11 @@ define([
187188 registry . get ( self . parentName + '.street.1' ) . set ( 'value' , formData . experius_postcode_housenumber ) . set ( 'error' , false ) ;
188189 self . debug ( 'address on two lines' ) ;
189190 } else {
190- registry . get ( self . parentName + '.street.0' ) . set ( 'value' , formData . street + ' ' + formData . experius_postcode_housenumber ) . set ( 'error' , false ) ;
191+ var street = typeof ( formData . street ) == 'object' ? formData . street [ 0 ] : formData . street ;
192+ registry . get ( self . parentName + '.street.0' ) . set ( 'value' , street + ' ' + formData . experius_postcode_housenumber ) . set ( 'error' , false ) ;
191193 self . debug ( 'address on single line' ) ;
192194 }
193195 registry . get ( self . parentName + '.postcode' ) . set ( 'value' , formData . experius_postcode_postcode ) . set ( 'error' , false ) ;
194- if (
195- typeof registry . get ( self . parentName + '.street.0' ) . get ( 'value' ) == 'object' ||
196- registry . get ( self . parentName + '.street.0' ) . get ( 'value' ) == '[object Object] '
197- ) {
198- this . debug ( 'Fixing street.0 as it contains [object Object]' ) ;
199- registry . get ( self . parentName + '.street.0' ) . set ( 'value' , '' ) . set ( 'error' , false ) ;
200- }
201196 this . debug ( 'postcode or housenumber not set. ' + 'housenumber:' + formData . experius_postcode_housenumber + ' postcode:' + formData . experius_postcode_postcode ) ;
202197 }
203198 } ,
@@ -542,7 +537,7 @@ define([
542537
543538 this . previousValue = newValue ;
544539 } ,
545-
540+
546541 removeOldAdditionFromString : function ( street ) {
547542 if ( this . previousValue != undefined && this . previousValue && street ) {
548543 var streetParts = ( "" + street ) . split ( " " ) ;
0 commit comments