Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 1f0c4c8

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - magento/magento2#14301: Fixed TypeError when search term does not exist on pressing Home or End button #14274 (by @drashmk) - magento/magento2#14305: [Forward Port] [#14089] Add Malaysian Locale Code (by @osrecio) - magento/magento2#14300: [ForwardPort 2.3] [#14072] Add Zip Pattern for Japan JP (by @osrecio) Fixed GitHub Issues: - magento/magento2#14274: Quick search fires error (reported by @jonathanKingston) has been fixed in magento/magento2#14301 by @drashmk in 2.3-develop branch Related commits: 1. bd47df7 2. 98be34b 3. a5252de - magento/magento2#14089: Malaysian (Malaysia) missing from locale list (reported by @superdav42) has been fixed in magento/magento2#14305 by @osrecio in 2.3-develop branch Related commits: 1. 7081c47 2. 7df2162 - magento/magento2#14072: Change zip code validation pattern for Japan (reported by @HirokazuNishi) has been fixed in magento/magento2#14300 by @osrecio in 2.3-develop branch Related commits: 1. 79474ca 2. 1e735aa
2 parents e70fff5 + 4e032c3 commit 1f0c4c8

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

app/code/Magento/Directory/etc/zip_codes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
<zip countryCode="JP">
208208
<codes>
209209
<code id="pattern_1" active="true" example="123-4567">^[0-9]{3}-[0-9]{4}$</code>
210-
<code id="pattern_2" active="true" example="123">^[0-9]{3}$</code>
210+
<code id="pattern_2" active="true" example="1234567">^[0-9]{7}$</code>
211211
</codes>
212212
</zip>
213213
<zip countryCode="JE">

app/code/Magento/Search/view/frontend/web/form-mini.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,17 @@ define([
206206

207207
switch (keyCode) {
208208
case $.ui.keyCode.HOME:
209-
this._getFirstVisibleElement().addClass(this.options.selectClass);
210-
this.responseList.selected = this._getFirstVisibleElement();
209+
if (this._getFirstVisibleElement()) {
210+
this._getFirstVisibleElement().addClass(this.options.selectClass);
211+
this.responseList.selected = this._getFirstVisibleElement();
212+
}
211213
break;
212214

213215
case $.ui.keyCode.END:
214-
this._getLastElement().addClass(this.options.selectClass);
215-
this.responseList.selected = this._getLastElement();
216+
if (this._getLastElement()) {
217+
this._getLastElement().addClass(this.options.selectClass);
218+
this.responseList.selected = this._getLastElement();
219+
}
216220
break;
217221

218222
case $.ui.keyCode.ESCAPE:

dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public function getPostcodesDataProvider()
133133
['countryId' => 'IL', 'postcode' => '12345'],
134134
['countryId' => 'IT', 'postcode' => '12345'],
135135
['countryId' => 'JP', 'postcode' => '123-4567'],
136-
['countryId' => 'JP', 'postcode' => '123'],
136+
['countryId' => 'JP', 'postcode' => '1234567'],
137137
['countryId' => 'JE', 'postcode' => 'TY8 9PL'],
138138
['countryId' => 'KZ', 'postcode' => '123456'],
139139
['countryId' => 'KE', 'postcode' => '12345'],

lib/internal/Magento/Framework/Locale/Config.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
7474
'lv_LV', /*Latvian (Latvia)*/
7575
'mk_MK', /*Macedonian (Macedonia)*/
7676
'mn_Cyrl_MN', /*Mongolian (Mongolia)*/
77+
'ms_MY', /*Malaysian (Malaysia)*/
7778
'ms_Latn_MY', /*Malaysian (Malaysia)*/
7879
'nl_BE', /*Dutch (Belgium)*/
7980
'nl_NL', /*Dutch (Netherlands)*/

0 commit comments

Comments
 (0)