From b5d83f0bde1303223026c66c1af06c1fdc6ca889 Mon Sep 17 00:00:00 2001 From: MrFry Date: Sun, 26 Jan 2020 09:31:35 +0100 Subject: [PATCH] Passive mode fix, console.log removes, passing xmlhttprequest errors to reject() --- stable.user.js | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/stable.user.js b/stable.user.js index a09b9df..63b4d24 100755 --- a/stable.user.js +++ b/stable.user.js @@ -775,11 +775,9 @@ document.getElementById('infoMainDiv').innerText = `${subjInfo.subjects} tárgy, ${subjInfo.questions} kérdés` // FIXME: if cwith() throws an unhandled error it sais server is not avaible cwith() - }).catch((err) => { + }).catch(() => { document.getElementById('menuButtonDiv').style.backgroundColor = 'red' document.getElementById('infoMainDiv').innerText = texts.noServer - console.log(err) - console.log('haaaaaaaa') }) } @@ -1507,9 +1505,13 @@ let passiveButton = CreateNodeWithText(buttonCell, texts.passiveMode, 'button') SetStyle(passiveButton, buttonStyle) - let setPassiveButtonState = (isPassive) => { - if (isPassive) { - ConnectToServer(AfterLoad) + let setPassiveButtonState = (isPassive, connect) => { + menuButtonDiv.style.background = '#262626' + if (!isPassive) { + infoDiv.innerText = texts.loading + if (connect) { + ConnectToServer(AfterLoad) + } } else { infoDiv.innerText = texts.passiveModeMenuBoxText } @@ -1517,11 +1519,11 @@ setPassiveButtonState(getVal('skipLoad')) passiveButton.addEventListener('click', function () { - let sl = getVal('skipLoad') - setVal('skipLoad', !sl) - setPassiveButtonState(sl) + let sl = !getVal('skipLoad') + setVal('skipLoad', sl) + setPassiveButtonState(sl, true) - if (!sl) { + if (sl) { ShowMessage({ m: texts.passiveModeActivated, isSimple: true @@ -1573,8 +1575,8 @@ resolve(JSON.parse(response.responseText)) }, onerror: (e) => { - console.log('GET ERROR', e) - reject(new Error('get error')) + Log('Info get Error', e) + reject(e) } }) }) @@ -1604,8 +1606,8 @@ } }, onerror: (e) => { - console.log('GET ERROR', e) - reject(new Error('get error')) + Log('Question answer get error', e) + reject(e) } }) }) @@ -1621,12 +1623,11 @@ headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - onerror: function (response) { - Log('XMLHTTP request POST error') - reject(new Error('unhandled error')) + onerror: function (e) { + Log('Data send error', e) + reject(e) }, onload: (resp) => { - console.log(resp.responseText) resolve(JSON.parse(resp.responseText)) } })