Skip to content

Commit 3330972

Browse files
MaikuolanMaikuolan
committed
v3.1.0
1 parent ece7c83 commit 3330972

File tree

4 files changed

+61
-54
lines changed

4 files changed

+61
-54
lines changed

‎Changelog.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@ __*Why "v3.0.0" instead of "v1.0.0?"*__ Prior to phpMussel v3, the "phpMussel Co
2121
[2020.10.30; New Feature; Maikuolan]: Added the ability to specify a custom assets path to the instantiated FrontEnd object.
2222

2323
[2020.11.27; Maikuolan]: Some minor code-style cleanup.
24+
25+
[2020.12.04; Maikuolan]: Maintenance release (dependencies update, repository cleanup, etc).

‎assets/config.yml‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# License: GNU/GPLv2
88
# @see LICENSE.txt
99
#
10-
# This file: Configuration defaults file (last modified: 2020.10.08).
10+
# This file: Configuration defaults file (last modified: 2020.12.04).
1111
##/
1212

1313
frontend:
@@ -28,25 +28,30 @@ frontend:
2828
Latin-3: "1.234.567,89"
2929
Latin-4: "1 234 567,89"
3030
Latin-5: "1,234,567·89"
31-
China-1: "123,4567.89"
32-
India-1: "12,34,567.89"
33-
India-2: "१२,३४,५६७.८९ (देवनागरी)"
34-
India-3: "૧૨,૩૪,૫૬૭.૮૯ (ગુજરાતી)"
35-
India-4: "੧੨,੩੪,੫੬੭.੮੯ (ਗੁਰਮੁਖੀ)"
36-
India-5: "೧೨,೩೪,೫೬೭.೮೯ (ಕನ್ನಡ)"
37-
India-6: "౧౨,౩౪,౫౬౭.౮౯ (తెలుగు)"
3831
Arabic-1: "١٢٣٤٥٦٧٫٨٩"
3932
Arabic-2: "١٬٢٣٤٬٥٦٧٫٨٩"
4033
Arabic-3: "۱٬۲۳۴٬۵۶۷٫۸۹"
4134
Arabic-4: "۱۲٬۳۴٬۵۶۷٫۸۹"
42-
Bengali-1: "১২,৩৪,৫৬৭.৮৯ (বাংলা সংখ্যাসমূহ)"
35+
Base-12: "4b6547.a8"
36+
Base-16: "12d687.e3"
37+
Bengali-1: "১২,৩৪,৫৬৭.৮৯"
4338
Burmese-1: "၁၂၃၄၅၆၇.၈၉"
39+
China-1: "123,4567.89"
40+
India-1: "12,34,567.89"
41+
India-2: "१२,३४,५६७.८९"
42+
India-3: "૧૨,૩૪,૫૬૭.૮૯"
43+
India-4: "੧੨,੩੪,੫੬੭.੮੯"
44+
India-5: "೧೨,೩೪,೫೬೭.೮೯"
45+
India-6: "౧౨,౩౪,౫౬౭.౮౯"
46+
Japanese: "百万二十万三万四千五百六十七・八九分"
47+
Javanese: "꧑꧒꧓꧔꧕꧖꧗.꧘꧙"
4448
Khmer-1: "១.២៣៤.៥៦៧,៨៩"
4549
Lao-1: "໑໒໓໔໕໖໗.໘໙"
50+
Mayan: "𝋧𝋮𝋦𝋨𝋧.𝋱𝋰"
51+
Mongolian: "᠑᠒᠓᠔᠕᠖᠗.᠘᠙"
52+
Odia: "୧୨୩୪୫୬୭.୮୯"
4653
Thai-1: "๑,๒๓๔,๕๖๗.๘๙"
4754
Thai-2: "๑๒๓๔๕๖๗.๘๙"
48-
Javanese: "꧑꧒꧓꧔꧕꧖꧗.꧘꧙"
49-
Odia: "୧୨୩୪୫୬୭.୮୯"
5055
Tibetan: "༡༢༣༤༥༦༧.༨༩"
5156
default_algo:
5257
type: "string"

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
},
1313
"require": {
1414
"php": ">=7.2.0",
15-
"maikuolan/common": "^2.3.2",
16-
"phpmussel/core": "^3.0.1",
15+
"maikuolan/common": "^2.4.0",
16+
"phpmussel/core": "^3.1",
1717
"ext-pcre": "*"
1818
},
1919
"autoload": {

‎src/FrontEnd.php‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* License: GNU/GPLv2
99
* @see LICENSE.txt
1010
*
11-
* This file: Front-end handler (last modified: 2020.11.27).
11+
* This file: Front-end handler (last modified: 2020.12.03).
1212
*/
1313

1414
namespace phpMussel\FrontEnd;
@@ -1113,15 +1113,15 @@ public function view(string $Page = '')
11131113
if ($DirValue['preview'] === 'kb') {
11141114
$ThisDir['Preview'] .= sprintf(
11151115
'<script type="text/javascript">function %1$s_function(){var e=%7$s?%7$s(' .
1116-
'\'%1$s_field\').value:%8$s&&!%7$s?%8$s.%1$s_field.value:\'\',z=e.replace' .
1117-
'(/o$/i,\'b\').substr(-2).toLowerCase(),y=\'kb\'==z?1:\'mb\'==z?1024:\'gb' .
1118-
'\'==z?1048576:\'tb\'==z?1073741824:\'b\'==e.substr(-1)?.0009765625:1,e=e' .
1119-
'.replace(/[^0-9]*$/i,\'\'),e=isNaN(e)?0:e*y,t=0>e?\'0 %2$s\':1>e?nft((10' .
1120-
'24*e).toFixed(0))+\' %2$s\':1024>e?nft((1*e).toFixed(2))+\' %3$s\':10485' .
1121-
'76>e?nft((e/1024).toFixed(2))+\' %4$s\':1073741824>e?nft((e/1048576).toF' .
1122-
'ixed(2))+\' %5$s\':nft((e/1073741824).toFixed(2))+\' %6$s\';%7$s?%7$s(\'' .
1123-
'%1$s_preview\').innerHTML=t:%8$s&&!%7$s?%8$s.%1$s_preview.innerHTML=t:\'' .
1124-
'\'};%1$s_function();</script>',
1116+
'\'%1$s_field\').value:%8$s&&!%7$s?%8$s.%1$s_field.value:\'\',z=e.replace' .
1117+
'(/o$/i,\'b\').substr(-2).toLowerCase(),y=\'kb\'==z?1:\'mb\'==z?1024:\'gb' .
1118+
'\'==z?1048576:\'tb\'==z?1073741824:\'b\'==e.substr(-1)?.0009765625:1,e=e' .
1119+
'.replace(/[^0-9]*$/i,\'\'),e=isNaN(e)?0:e*y,t=0>e?\'0 %2$s\':1>e?nft((10' .
1120+
'24*e).toFixed(0))+\' %2$s\':1024>e?nft((1*e).toFixed(2))+\' %3$s\':10485' .
1121+
'76>e?nft((e/1024).toFixed(2))+\' %4$s\':1073741824>e?nft((e/1048576).toF' .
1122+
'ixed(2))+\' %5$s\':nft((e/1073741824).toFixed(2))+\' %6$s\';%7$s?%7$s(\'' .
1123+
'%1$s_preview\').innerHTML=t:%8$s&&!%7$s?%8$s.%1$s_preview.innerHTML=t:\'' .
1124+
'\'};%1$s_function();</script>',
11251125
$ThisDir['DirLangKey'],
11261126
$this->Loader->L10N->getPlural(0, 'field_size_bytes'),
11271127
$this->Loader->L10N->getString('field_size_KB'),
@@ -1134,16 +1134,16 @@ public function view(string $Page = '')
11341134
} elseif ($DirValue['preview'] === 'seconds') {
11351135
$ThisDir['Preview'] .= sprintf(
11361136
'<script type="text/javascript">function %1$s_function(){var t=%9$s?%9$s(' .
1137-
'\'%1$s_field\').value:%10$s&&!%9$s?%10$s.%1$s_field.value:\'\',e=isNaN(t' .
1138-
')?0:0>t?t*-1:t,n=e?Math.floor(e/31536e3):0,e=e?e-31536e3*n:0,o=e?Math.fl' .
1139-
'oor(e/2592e3):0,e=e-2592e3*o,l=e?Math.floor(e/604800):0,e=e-604800*l,r=e' .
1140-
'?Math.floor(e/86400):0,e=e-86400*r,d=e?Math.floor(e/3600):0,e=e-3600*d,i' .
1141-
'=e?Math.floor(e/60):0,e=e-60*i,f=e?Math.floor(1*e):0,a=nft(n.toString())' .
1142-
'+\' %2$s – \'+nft(o.toString())+\' %3$s – \'+nft(l.toString())+\' %4$s –' .
1143-
' \'+nft(r.toString())+\' %5$s – \'+nft(d.toString())+\' %6$s – \'+nft(i.' .
1144-
'toString())+\' %7$s – \'+nft(f.toString())+\' %8$s\';%9$s?%9$s(\'%1$s_pr' .
1145-
'eview\').innerHTML=a:%10$s&&!%9$s?%10$s.%1$s_preview.innerHTML=a:\'\'}' .
1146-
'%1$s_function();</script>',
1137+
'\'%1$s_field\').value:%10$s&&!%9$s?%10$s.%1$s_field.value:\'\',e=isNaN(t' .
1138+
')?0:0>t?t*-1:t,n=e?Math.floor(e/31536e3):0,e=e?e-31536e3*n:0,o=e?Math.fl' .
1139+
'oor(e/2592e3):0,e=e-2592e3*o,l=e?Math.floor(e/604800):0,e=e-604800*l,r=e' .
1140+
'?Math.floor(e/86400):0,e=e-86400*r,d=e?Math.floor(e/3600):0,e=e-3600*d,i' .
1141+
'=e?Math.floor(e/60):0,e=e-60*i,f=e?Math.floor(1*e):0,a=nft(n.toString())' .
1142+
'+\' %2$s – \'+nft(o.toString())+\' %3$s – \'+nft(l.toString())+\' %4$s –' .
1143+
' \'+nft(r.toString())+\' %5$s – \'+nft(d.toString())+\' %6$s – \'+nft(i.' .
1144+
'toString())+\' %7$s – \'+nft(f.toString())+\' %8$s\';%9$s?%9$s(\'%1$s_pr' .
1145+
'eview\').innerHTML=a:%10$s&&!%9$s?%10$s.%1$s_preview.innerHTML=a:\'\'}' .
1146+
'%1$s_function();</script>',
11471147
$ThisDir['DirLangKey'],
11481148
$this->Loader->L10N->getString('previewer_years'),
11491149
$this->Loader->L10N->getString('previewer_months'),
@@ -1158,16 +1158,16 @@ public function view(string $Page = '')
11581158
} elseif ($DirValue['preview'] === 'minutes') {
11591159
$ThisDir['Preview'] .= sprintf(
11601160
'<script type="text/javascript">function %1$s_function(){var t=%9$s?%9$s(' .
1161-
'\'%1$s_field\').value:%10$s&&!%9$s?%10$s.%1$s_field.value:\'\',e=isNaN(t' .
1162-
')?0:0>t?t*-1:t,n=e?Math.floor(e/525600):0,e=e?e-525600*n:0,o=e?Math.floo' .
1163-
'r(e/43200):0,e=e-43200*o,l=e?Math.floor(e/10080):0,e=e-10080*l,r=e?Math.' .
1164-
'floor(e/1440):0,e=e-1440*r,d=e?Math.floor(e/60):0,e=e-60*d,i=e?Math.floo' .
1165-
'r(e*1):0,e=e-i,f=e?Math.floor(60*e):0,a=nft(n.toString())+\' %2$s – \'+n' .
1166-
'ft(o.toString())+\' %3$s – \'+nft(l.toString())+\' %4$s – \'+nft(r.toStr' .
1167-
'ing())+\' %5$s – \'+nft(d.toString())+\' %6$s – \'+nft(i.toString())+\' ' .
1168-
'%7$s – \'+nft(f.toString())+\' %8$s\';%9$s?%9$s(\'%1$s_preview\').innerH' .
1169-
'TML=a:%10$s&&!%9$s?%10$s.%1$s_preview.innerHTML=a:\'\'}%1$s_function();<' .
1170-
'/script>',
1161+
'\'%1$s_field\').value:%10$s&&!%9$s?%10$s.%1$s_field.value:\'\',e=isNaN(t' .
1162+
')?0:0>t?t*-1:t,n=e?Math.floor(e/525600):0,e=e?e-525600*n:0,o=e?Math.floo' .
1163+
'r(e/43200):0,e=e-43200*o,l=e?Math.floor(e/10080):0,e=e-10080*l,r=e?Math.' .
1164+
'floor(e/1440):0,e=e-1440*r,d=e?Math.floor(e/60):0,e=e-60*d,i=e?Math.floo' .
1165+
'r(e*1):0,e=e-i,f=e?Math.floor(60*e):0,a=nft(n.toString())+\' %2$s – \'+n' .
1166+
'ft(o.toString())+\' %3$s – \'+nft(l.toString())+\' %4$s – \'+nft(r.toStr' .
1167+
'ing())+\' %5$s – \'+nft(d.toString())+\' %6$s – \'+nft(i.toString())+\' ' .
1168+
'%7$s – \'+nft(f.toString())+\' %8$s\';%9$s?%9$s(\'%1$s_preview\').innerH' .
1169+
'TML=a:%10$s&&!%9$s?%10$s.%1$s_preview.innerHTML=a:\'\'}%1$s_function();<' .
1170+
'/script>',
11711171
$ThisDir['DirLangKey'],
11721172
$this->Loader->L10N->getString('previewer_years'),
11731173
$this->Loader->L10N->getString('previewer_months'),
@@ -1182,15 +1182,15 @@ public function view(string $Page = '')
11821182
} elseif ($DirValue['preview'] === 'hours') {
11831183
$ThisDir['Preview'] .= sprintf(
11841184
'<script type="text/javascript">function %1$s_function(){var t=%9$s?%9$s(' .
1185-
'\'%1$s_field\').value:%10$s&&!%9$s?%10$s.%1$s_field.value:\'\',e=isNaN(t' .
1186-
')?0:0>t?t*-1:t,n=e?Math.floor(e/8760):0,e=e?e-8760*n:0,o=e?Math.floor(e/' .
1187-
'720):0,e=e-720*o,l=e?Math.floor(e/168):0,e=e-168*l,r=e?Math.floor(e/24):' .
1188-
'0,e=e-24*r,d=e?Math.floor(e*1):0,e=e-d,i=e?Math.floor(60*e):0,e=e-(i/60)' .
1189-
',f=e?Math.floor(3600*e):0,a=nft(n.toString())+\' %2$s – \'+nft(o.toStrin' .
1190-
'g())+\' %3$s – \'+nft(l.toString())+\' %4$s – \'+nft(r.toString())+\' ' .
1191-
'%5$s – \'+nft(d.toString())+\' %6$s – \'+nft(i.toString())+\' %7$s – \'+' .
1192-
'nft(f.toString())+\' %8$s\';%9$s?%9$s(\'%1$s_preview\').innerHTML=a:' .
1193-
'%10$s&&!%9$s?%10$s.%1$s_preview.innerHTML=a:\'\'}%1$s_function();</script>',
1185+
'\'%1$s_field\').value:%10$s&&!%9$s?%10$s.%1$s_field.value:\'\',e=isNaN(t' .
1186+
')?0:0>t?t*-1:t,n=e?Math.floor(e/8760):0,e=e?e-8760*n:0,o=e?Math.floor(e/' .
1187+
'720):0,e=e-720*o,l=e?Math.floor(e/168):0,e=e-168*l,r=e?Math.floor(e/24):' .
1188+
'0,e=e-24*r,d=e?Math.floor(e*1):0,e=e-d,i=e?Math.floor(60*e):0,e=e-(i/60)' .
1189+
',f=e?Math.floor(3600*e):0,a=nft(n.toString())+\' %2$s – \'+nft(o.toStrin' .
1190+
'g())+\' %3$s – \'+nft(l.toString())+\' %4$s – \'+nft(r.toString())+\' ' .
1191+
'%5$s – \'+nft(d.toString())+\' %6$s – \'+nft(i.toString())+\' %7$s – \'+' .
1192+
'nft(f.toString())+\' %8$s\';%9$s?%9$s(\'%1$s_preview\').innerHTML=a:' .
1193+
'%10$s&&!%9$s?%10$s.%1$s_preview.innerHTML=a:\'\'}%1$s_function();</script>',
11941194
$ThisDir['DirLangKey'],
11951195
$this->Loader->L10N->getString('previewer_years'),
11961196
$this->Loader->L10N->getString('previewer_months'),
@@ -1205,8 +1205,8 @@ public function view(string $Page = '')
12051205
} elseif ($DirValue['preview'] === 'allow_other') {
12061206
$ThisDir['Preview'] .= sprintf(
12071207
'<script type="text/javascript">function %1$s_function(){var e=%2$s?%2$s(' .
1208-
'\'%1$s_field\').value:%3$s&&!%2$s?%3$s.%1$s_field.value:\'\';e==\'Other\'' .
1209-
'?showid(\'%4$s_field\'):hideid(\'%4$s_field\')};%1$s_function();</script>',
1208+
'\'%1$s_field\').value:%3$s&&!%2$s?%3$s.%1$s_field.value:\'\';e==\'Other\'' .
1209+
'?showid(\'%4$s_field\'):hideid(\'%4$s_field\')};%1$s_function();</script>',
12101210
$ThisDir['DirLangKey'],
12111211
'document.getElementById',
12121212
'document.all',

0 commit comments

Comments
 (0)