Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-09 11:14:02 +02:00
Code Issues Projects Releases Wiki Activity

Dont ask for reload confirmation when autoreload is enabled

Browse source
This commit is contained in:
Kovid Goyal 2017-04-23 08:35:10 +05:30
parent eda1926d58
commit ebeec06b0b
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/pyj/srv.pyj
View file

@ -12,6 +12,7 @@
from read_book.iframe import init
is_running_in_iframe = False # Changed before script is loaded in the iframe
autoreload_enabled = False
if is_running_in_iframe:
init()
@ -20,11 +21,11 @@
if window.applicationCache.status is window.applicationCache.UPDATEREADY:
try:
window.applicationCache.swapCache()
if window.confirm(_('The calibre web application has been updated. Do you want reload the site?')):
if autoreload_enabled or window.confirm(_('The calibre web application has been updated. Do you want reload the site?')):
window.location.reload()
except Exception as e:
# For some reason swapCache occassionally fails even though status is UPDATEREADY
print('WARNING: falied to swap applicationCache')
# For some reason swapCache occasionally fails even though status is UPDATEREADY
print('WARNING: failed to swap applicationCache')
console.log(e)
, False)
script = document.currentScript or document.scripts[0]
@ -37,8 +38,10 @@
window.addEventListener('load', main)
ajax('auto-reload-port', def(end_type, xhr, event):
nonlocal autoreload_enabled
if end_type is 'load':
port = parseInt(xhr.responseText)
if not isNaN(port) and port > 0:
autoreload_enabled = True
create_auto_reload_watcher(port)
).send() # We must bypass cache as otherwise we could get stale port info