Skip to content

Commit ce37c30

Browse files
Thorin-OakenpantsThorin-Oakenpants
authored
update (#343)
1 parent 00926c9 commit ce37c30

16 files changed

+189
-274
lines changed

‎js/audio.js

+10-41
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,9 @@ const get_audio_context = (METRIC) => new Promise(resolve => {
7575
} else if ('android' == isOS && '2b9d44b0' == hash) {notation = rfp_green // 0.02
7676
} else if ('9b69969b' == hash) {notation = rfp_green} // 0.025 catchall incl linux
7777
}
78-
if (isTB && !isMullvad && isVer == 115) {notation = tb_red} // TB should be an error
7978
if (isGecko && notation !== rfp_green) {data['ac-outputLatency'] = zNA; hash = mini(data)}
8079

8180
} catch(e) {
82-
if (isTB && !isMullvad && isVer == 115) {notation = (e+'' === 'TypeError: window.AudioContext is not a constructor' ? tb_green : tb_red)}
8381
hash = log_error(11, METRIC, e); data = zErr
8482
}
8583
addBoth(11, METRIC, hash, btn, notation, data, isLies)
@@ -88,7 +86,7 @@ const get_audio_context = (METRIC) => new Promise(resolve => {
8886
})
8987

9088
const get_audio_offline = () => new Promise(resolve => {
91-
let t0 = nowFn(), notation ='', isLies = false
89+
let t0 = nowFn(), notation = rfp_red, isLies = false
9290
const METRIC = 'offlineAudioContext'
9391

9492
function outputErrors(display) {
@@ -143,19 +141,9 @@ const get_audio_offline = () => new Promise(resolve => {
143141
let display = hashC +' | '+ hashG +' | '+ sum, value = hashG
144142
// lies
145143
if (hashG !== hashC) {isLies = true} else {isLies = check_audioLies()}
146-
// notation
147-
if (isTB && 115 == isVer) {
148-
if (!isMullvad || isLies) {notation = tb_red}
149-
} else if (isVer > 117) {
150-
notation = default_red
151-
if (!isLies) {
152-
// two results: ARM and non-ARM
153-
notation = sbx +'undocumented]'+ sc
154-
if (isVer > 123 && hashC == 'a7c1fbb6') {notation = sgtick+'x86/amd]'+sc // 1877221
155-
} else if (hashC == '24fc63ce') {notation = sgtick+'x86/amd]'+sc
156-
} else if (hashC == 'a34c73cd') {notation = sgtick+'ARM]'+sc}
157-
}
158-
}
144+
// notation: two results: ARM and non-ARM
145+
if (hashC == 'a7c1fbb6') {notation = sgtick+'x86/amd]'+sc // 1877221 FF123+
146+
} else if (hashC == 'a34c73cd') {notation = sgtick+'ARM]'+sc}
159147
addBoth(11, METRIC, display,'', notation, value, isLies)
160148
log_perf(11, METRIC, t0)
161149
return resolve()
@@ -169,19 +157,14 @@ const get_audio_offline = () => new Promise(resolve => {
169157
}
170158
} catch(e) {
171159
if (gRun) {dom.oscillator_compressor = zNA; dom.oscillator = zNA; dom.audio_user = zNA}
172-
if (isTB && !isMullvad && isVer == 115) {
173-
notation = e+'' === 'TypeError: window.OfflineAudioContext is not a constructor' ? tb_green : tb_red
174-
} else {
175-
notation = default_red
176-
}
177160
outputErrors(log_error(11, METRIC, e))
178161
}
179162
})
180163

181164
const get_oscillator = () => new Promise(resolve => {
182165
let t0 = nowFn()
183166
const METRIC = 'oscillator'
184-
let notation = (isSmart && isVer > 117) ? rfp_red : ''
167+
let notation = isSmart ? rfp_red : ''
185168

186169
function exit(display, value) {
187170
if (value == undefined) {value = display}
@@ -221,15 +204,8 @@ const get_oscillator = () => new Promise(resolve => {
221204
if ('number' !== typeCheck) {throw zErrType + typeCheck}
222205
let hash = mini(results)
223206
if (isSmart) {
224-
if (isTB && !isMullvad && isVer == 115) {
225-
notation = tb_red // TB should be an error
226-
} else if (isVer > 123) {
227-
if (hash == '5b3956a9') {notation = sgtick+'x86/amd]'+sc // 1877221
228-
} else if (hash == 'f263f055') {notation = sgtick+'RFP ARM]'+sc}
229-
} else if (isVer > 117) {
230-
if (hash == 'e9f98e24') {notation = sgtick+'RFP x86/amd]'+sc
231-
} else if (hash == '1348e98d') {notation = sgtick+'RFP ARM]'+sc}
232-
}
207+
if (hash == '5b3956a9') {notation = sgtick+'x86/amd]'+sc // 1877221
208+
} else if (hash == 'f263f055') {notation = sgtick+'RFP ARM]'+sc}
233209
}
234210
exit(hash)
235211
} catch(e) {
@@ -245,7 +221,7 @@ const get_oscillator = () => new Promise(resolve => {
245221
const get_oscillator_compressor = () => new Promise(resolve => {
246222
let t0 = nowFn()
247223
const METRIC = 'oscillator_compressor'
248-
let notation = (isSmart && isVer > 117) ? rfp_red : ''
224+
let notation = isSmart ? rfp_red : ''
249225

250226
function exit(display, value) {
251227
if (value == undefined) {value = display}
@@ -294,15 +270,8 @@ const get_oscillator_compressor = () => new Promise(resolve => {
294270
if ('number' !== typeCheck) {throw zErrType + typeCheck}
295271
let hash = mini(results)
296272
if (isSmart) {
297-
if (isTB && !isMullvad && isVer == 115) {
298-
notation = tb_red // TB should be an error
299-
} else if (isVer > 123) {
300-
if (hash == 'e08487bf') {notation = sgtick+'x86/amd]'+sc // 1877221
301-
} else if (hash == '1f38e089') {notation = sgtick+'RFP ARM]'+sc}
302-
} else if (isVer > 117) {
303-
if (hash == 'bafe56d6') {notation = sgtick+'RFP x86/amd]'+sc
304-
} else if (hash == 'c54b7aa9') {notation = sgtick+'RFP ARM]'+sc}
305-
}
273+
if (hash == 'e08487bf') {notation = sgtick+'x86/amd]'+sc // 1877221
274+
} else if (hash == '1f38e089') {notation = sgtick+'RFP ARM]'+sc}
306275
}
307276
exit(hash)
308277
} catch(e) {

‎js/canvas.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -590,10 +590,10 @@ const outputCanvas = () => new Promise(resolve => {
590590
// exclude solids: FPP does not tamper with those
591591
// exclude if all white | exclude if proxy lies
592592
// note: isGetStealth is getImageData
593-
if (!isWhite && isVer > 119 && !isTB && !name.includes('_solid')) {
593+
if (!isWhite && !isTB && !name.includes('_solid')) {
594594
if (!isProxyLie(proxyMap[name] +'.'+ name)) {
595595
if ('ge' == key && !isGetStealth || 'ge' !== key) {
596-
notation = fpp_green
596+
notation = fpp_green
597597
}
598598
}
599599
}

‎js/css.js

+3-20
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ function get_colors() {
4343
'-moz-buttondefault','-moz-dragtargetzone','-moz-mac-chrome-active','-moz-mac-chrome-inactive',
4444
'-moz-mac-menuselect','-moz-mac-menushadow','-moz-mac-secondaryhighlight','-moz-menubartext',
4545
'-moz-win-communicationstext','-moz-win-mediatext',
46-
// removed FF103
47-
'-moz-mac-vibrant-titlebar-dark','-moz-mac-vibrant-titlebar-light',
4846
)
4947
oList.moz = aTmp.sort()
5048
}
@@ -87,13 +85,7 @@ function get_colors() {
8785
for (const k of Object.keys(tmpobj).sort()) {data[k] = tmpobj[k]; count += data[k].length} // sort/count
8886
hash = mini(data); btn = addButton(14, METRIC, Object.keys(data).length +'/'+ count)
8987
if ('moz' == type) {
90-
let check = '283089dc' // 122+
91-
if (isVer < 117) {check = '788e7d22' // 115-116
92-
} else if (isVer < 119) {check = '5a00aa84' // 117-118
93-
} else if (isVer < 121) {check = '47538602' // 119-120
94-
} else if (isVer < 122) {check = '651a1b85' // 121
95-
}
96-
notation = hash == check ? rfp_green : rfp_red
88+
notation = '283089dc' == hash ? rfp_green : rfp_red
9789
}
9890
} catch(e) {
9991
hash = e; data = zErrLog
@@ -285,16 +277,7 @@ function get_computed_styles(METRIC) {
285277
/* mac 1104 vs win 1102: mac has: MozOsxFontSmoothing, -moz-osx-font-smoothing */
286278
if ('75b00d93' == hash) {notation = tb_green} // TB 1104
287279
} else {
288-
/* win diff
289-
layout.css.font-variations.enabled = locked false on win 7
290-
fontOpticalSizing, font-optical-sizing, fontVariationSettings, font-variation-settings
291-
*/
292-
if (115 == isVer) {
293-
if ('e32d06bd' == hash) {notation = tb_green // TB/MB win11 + linux, TB android: 1102
294-
} else if ('e14684e7' == hash) {notation = tb_green} // TB/MB win7 1098
295-
} else if (128 == isVer) {
296-
if ('d86abd90' == hash) {notation = tb_green}
297-
}
280+
if ('d86abd90' == hash) {notation = tb_green}
298281
}
299282
}
300283
} else {
@@ -323,7 +306,7 @@ function get_computed_styles(METRIC) {
323306

324307
function get_link(METRIC) {
325308
// FF120+ 1858397: layout.css.always_underline_links
326-
let value, data ='', notation = isVer < 120 ? '' : default_red
309+
let value, data ='', notation = default_red
327310
if (!isGecko || isVer < 120) {
328311
value = zNA
329312
} else {

‎js/elements.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ function get_element_keys(METRIC) {
101101
// still awaiting android isTB
102102
} else {
103103
// desktop
104-
if (115 == isVer && '156e1033' == hash || 128 == isVer && 'eb81553d' == hash) {notation = tb_green}
104+
if ('eb81553d' == hash) {notation = tb_green}
105105
}
106106
}
107107
} catch (e) {
@@ -270,8 +270,9 @@ function get_widget_sizes(METRIC) {
270270
checkbox: '',
271271
color: '',
272272
date: '',
273-
"datetime-local": '',
273+
'datetime-local': '',
274274
details: '<details></details>',
275+
'details_open': '<details open="">.</details>',
275276
directory: '<input webkitdirectory directory type="file">',
276277
file: '',
277278
files: '<input multiple="" type="file">',

‎js/fonts.js

+28-44
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,14 @@ let fntMaster = {
8282
// TB whitelist system
8383
allowlist: {
8484
android: [],
85-
linux: [],
85+
linux: [
86+
'Arial','Courier','Courier New','Helvetica','Times','Times New Roman' // aliases
87+
],
8688
mac: [
87-
'AppleGothic','Apple Color Emoji','Arial','Courier','Courier New',
89+
'AppleGothic','Apple Color Emoji','Arial','Arial Black','Arial Narrow','Courier','Courier New',
8890
'Geneva','Georgia','Heiti TC','Helvetica','Helvetica Neue','Hiragino Kaku Gothic ProN',
8991
'Kailasa','Lucida Grande','Menlo','Monaco','PingFang HK','PingFang SC','PingFang TC','Songti SC',
9092
'Songti TC','Tahoma','Thonburi','Times','Times New Roman','Verdana',
91-
// 'Arial Black','Arial Narrow', // hardcode these in once we are min Smart 128
9293
// always
9394
'-apple-system',
9495
/* variants
@@ -507,16 +508,6 @@ function set_fntList() {
507508
fntData.full = array
508509
fntData.full.push(fntFake)
509510
} else if (isTB) {
510-
// TB #42494
511-
// ToDo: when min Smart is 128, just hardcode into allowlist
512-
if (isVer > 115) {
513-
fntMaster.allowlist.mac.push('Arial Black','Arial Narrow')
514-
fntMaster.allowlist.linux.push('Arial','Courier','Courier New','Helvetica','Times','Times New Roman')
515-
} else {
516-
fntMaster.blocklist.mac.push('Arial Black','Arial Narrow')
517-
fntMaster.blocklist.linux.push('Arial','Courier','Courier New','Helvetica','Times','Times New Roman') // aliases
518-
}
519-
520511
// desktop TB
521512
let aBundled = []
522513
fntMaster.bundled.notoboth.forEach(function(fnt) {aBundled.push('Noto Sans '+ fnt, 'Noto Serif '+ fnt)})
@@ -585,11 +576,7 @@ function set_fntList() {
585576
if ('android' == isOS) {
586577
fntBtn = fntBtnAll
587578
} else if (isTB) {
588-
if ('linux' == isOS && isVer < 128) {
589-
fntBtn = fntBtnBundled +' + '+ fntBtnUnexpected +' = '+ fntBtnAll
590-
} else {
591-
fntBtn = fntBtnSystem +' + '+ fntBtnBundled +' = '+ fntBtnBase +' + '+ fntBtnUnexpected +' = '+ fntBtnAll
592-
}
579+
fntBtn = fntBtnSystem +' + '+ fntBtnBundled +' = '+ fntBtnBase +' + '+ fntBtnUnexpected +' = '+ fntBtnAll
593580
} else if ('windows' == isOS) {
594581
fntBtn = fntBtnBase +' + '+ fntBtnBaseLang +' = '+ fntBtnFPP +' + '+ fntBtnUnexpected +' = '+ fntBtnAll
595582
} else {
@@ -1407,8 +1394,7 @@ function get_system_fonts(METRIC) {
14071394
'system_fonts': ['caption','icon','menu','message-box','small-caption','status-bar']
14081395
}
14091396
let aProps = ['font-size','font-style','font-weight','font-family']
1410-
let hash, btn ='', data = {}, notation = ''
1411-
if ('moz_fonts' == METRIC) {notation = default_red} else if (isTB || isVer > 127) {notation = rfp_red}
1397+
let hash, btn ='', data = {}, notation = 'moz_fonts' == METRIC ? default_red : rfp_red
14121398

14131399
try {
14141400
let tmpdata = {}
@@ -1438,7 +1424,7 @@ function get_system_fonts(METRIC) {
14381424
} else if ('android' == isOS) {
14391425
if ('7e76c987' == hash) {notation = default_green} // 16px normal 400 sans-serif
14401426
}
1441-
} else if (isTB || isVer > 127) {
1427+
} else {
14421428
// RFP FF128+
14431429
if ('windows' == isOS) {
14441430
if ('a75e7a17' == hash) {notation = rfp_green} // 12px normal 400 sans-serif
@@ -1471,7 +1457,7 @@ function get_widget_fonts(METRIC) {
14711457
'password','radio','range','reset','search','select','submit','tel','text','textarea','time','url','week',
14721458
]
14731459
let aProps = ['font-family','font-size']
1474-
let hash, btn='', data = {}, notation = (isTB || isVer > 127) ? rfp_red : ''
1460+
let hash, btn='', data = {}, notation = rfp_red
14751461
try {
14761462
let tmpdata = {}
14771463
aList.forEach(function(name) {
@@ -1495,28 +1481,26 @@ function get_widget_fonts(METRIC) {
14951481
hash = mini(data)
14961482
btn = addButton(12, METRIC, Object.keys(data).length +'/'+ count)
14971483
// RFP FF128+
1498-
if (isTB || isVer > 127) {
1499-
if ('windows' == isOS && '24717aa8' == hash) {notation = rfp_green
1500-
/*monospace 13.3333px: [date, datetime-local, time],
1501-
monospace 13px: [textarea],
1502-
sans-serif 13.3333px: [19 items],
1503-
sans-serif 13px: [image]*/
1504-
} else if ('mac' == isOS && '12e7f88a' == hash) {notation = rfp_green
1505-
/*-apple-system 13.3333px: [19 items],
1506-
monospace 13.3333px: [date, datetime-local, time],
1507-
monospace 13px: [textarea],
1508-
sans-serif 13px: [image] */
1509-
} else if ('linux' == isOS && '99054729' == hash) {notation = rfp_green
1510-
/*monospace 12px: [textarea],
1511-
monospace 13.3333px: [date, datetime-local, time],
1512-
sans-serif 13.3333px: [19 items],
1513-
sans-serif 13px: [image]*/
1514-
} else if ('android' == isOS && '0833dc19' == hash) {notation = rfp_green
1515-
/*Roboto 13.3333px: [19 items],
1516-
monospace 12px: [textarea],
1517-
monospace 13.3333px: [date, datetime-local, time],
1518-
sans-serif 13px: [image]*/
1519-
}
1484+
if ('windows' == isOS && '24717aa8' == hash) {notation = rfp_green
1485+
/*monospace 13.3333px: [date, datetime-local, time],
1486+
monospace 13px: [textarea],
1487+
sans-serif 13.3333px: [19 items],
1488+
sans-serif 13px: [image]*/
1489+
} else if ('mac' == isOS && '12e7f88a' == hash) {notation = rfp_green
1490+
/*-apple-system 13.3333px: [19 items],
1491+
monospace 13.3333px: [date, datetime-local, time],
1492+
monospace 13px: [textarea],
1493+
sans-serif 13px: [image] */
1494+
} else if ('linux' == isOS && '99054729' == hash) {notation = rfp_green
1495+
/*monospace 12px: [textarea],
1496+
monospace 13.3333px: [date, datetime-local, time],
1497+
sans-serif 13.3333px: [19 items],
1498+
sans-serif 13px: [image]*/
1499+
} else if ('android' == isOS && '0833dc19' == hash) {notation = rfp_green
1500+
/*Roboto 13.3333px: [19 items],
1501+
monospace 12px: [textarea],
1502+
monospace 13.3333px: [date, datetime-local, time],
1503+
sans-serif 13px: [image]*/
15201504
}
15211505
} catch(e) {
15221506
hash = e; data = zErrLog

0 commit comments

Comments
 (0)