Skip to content

Commit

Permalink
webui: once more tweak the page reload question
Browse files Browse the repository at this point in the history
Rephrase a bit, since it is a yes / no question box.
Losing the connection triggers ping handlers anyway.
  • Loading branch information
mcspr committed Jul 19, 2021
1 parent 84a7f63 commit 8e5ab5c
Showing 21 changed files with 11,354 additions and 11,344 deletions.
Binary file modified code/espurna/data/index.all.html.gz
Binary file not shown.
Binary file modified code/espurna/data/index.curtain.html.gz
Binary file not shown.
Binary file modified code/espurna/data/index.garland.html.gz
Binary file not shown.
Binary file modified code/espurna/data/index.light.html.gz
Binary file not shown.
Binary file modified code/espurna/data/index.lightfox.html.gz
Binary file not shown.
Binary file modified code/espurna/data/index.rfbridge.html.gz
Binary file not shown.
Binary file modified code/espurna/data/index.rfm69.html.gz
Binary file not shown.
Binary file modified code/espurna/data/index.sensor.html.gz
Binary file not shown.
Binary file modified code/espurna/data/index.small.html.gz
Binary file not shown.
Binary file modified code/espurna/data/index.thermostat.html.gz
Binary file not shown.
4,191 changes: 2,096 additions & 2,095 deletions code/espurna/static/index.all.html.gz.h

Large diffs are not rendered by default.

2,717 changes: 1,359 additions & 1,358 deletions code/espurna/static/index.curtain.html.gz.h

Large diffs are not rendered by default.

1,661 changes: 831 additions & 830 deletions code/espurna/static/index.garland.html.gz.h

Large diffs are not rendered by default.

2,583 changes: 1,292 additions & 1,291 deletions code/espurna/static/index.light.html.gz.h

Large diffs are not rendered by default.

1,433 changes: 717 additions & 716 deletions code/espurna/static/index.lightfox.html.gz.h

Large diffs are not rendered by default.

1,503 changes: 752 additions & 751 deletions code/espurna/static/index.rfbridge.html.gz.h

Large diffs are not rendered by default.

1,509 changes: 755 additions & 754 deletions code/espurna/static/index.rfm69.html.gz.h

Large diffs are not rendered by default.

2,785 changes: 1,393 additions & 1,392 deletions code/espurna/static/index.sensor.html.gz.h

Large diffs are not rendered by default.

2,607 changes: 1,304 additions & 1,303 deletions code/espurna/static/index.small.html.gz.h

Large diffs are not rendered by default.

1,703 changes: 852 additions & 851 deletions code/espurna/static/index.thermostat.html.gz.h

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions code/html/custom.js
Original file line number Diff line number Diff line change
@@ -968,14 +968,14 @@ function sendAction(action, data) {

function askSaveSettings(ask) {
if (Settings.counters.changed > 0) {
return ask("Some changes have not been saved yet, do you want to save them first?");
return ask("There are pending changes to the settings, continue the operation without saving?");
}

return true;
}

function askDisconnect(ask) {
return ask("Are you sure you want to disconnect from the current WIFI network?");
return ask("Are you sure you want to disconnect from the current WiFi network?");
}

function askReboot(ask) {
@@ -1100,7 +1100,6 @@ function handleFirmwareUpgrade(event) {
progress.style.display = "none";
if ("OK" === xhr.responseText) {
alert(msg_ok);
pageReloadIn(5000);
} else {
alert(msg_err + xhr.status.toString() + " " + xhr.statusText + ", " + xhr.responseText);
}
@@ -2520,6 +2519,7 @@ function connectToURL(url) {
}

// Nothing to do, reload page and retry on errors
notifyError(`${Urls.ws.href} responded with status code ${response.status}, reloading the page`, null, 0, 0, null);
pageReloadIn(5000);
}).catch((error) => {
notifyError(null, null, 0, 0, error);

0 comments on commit 8e5ab5c

Please sign in to comment.