oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always update loading screen site too large message with site info received

Browse source
This commit is contained in:
shortcutme 2020-01-04 16:53:49 +01:00
parent 9085a4b0cc
commit c1ad7914f1
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Ui/media/Wrapper.coffee
View file

@ -528,14 +528,11 @@ class Wrapper
@address = site_info.address @address = site_info.address
@setSiteInfo site_info @setSiteInfo site_info
if site_info.settings.size > site_info.size_limit*1024*1024 # Site size too large and not displaying it yet if site_info.settings.size > site_info.size_limit * 1024 * 1024 and not @loading.screen_visible # Site size too large and not displaying it yet
if @loading.screen_visible @displayConfirm "Site is larger than allowed: #{(site_info.settings.size/1024/1024).toFixed(1)}MB/#{site_info.size_limit}MB", "Set limit to #{site_info.next_size_limit}MB", =>
@loading.showTooLarge(site_info) @ws.cmd "siteSetLimit", [site_info.next_size_limit], (res) =>
else if res == "ok"
@displayConfirm "Site is larger than allowed: #{(site_info.settings.size/1024/1024).toFixed(1)}MB/#{site_info.size_limit}MB", "Set limit to #{site_info.next_size_limit}MB", => @notifications.add("size_limit", "done", "Site storage limit modified!", 5000)
@ws.cmd "siteSetLimit", [site_info.next_size_limit], (res) =>
if res == "ok"
@notifications.add("size_limit", "done", "Site storage limit modified!", 5000)
if site_info.content?.title? if site_info.content?.title?
window.document.title = site_info.content.title + " - ZeroNet" window.document.title = site_info.content.title + " - ZeroNet"
@ -586,12 +583,17 @@ class Wrapper
@notifications.add("size_limit", "done", "Site storage limit modified!", 5000) @notifications.add("size_limit", "done", "Site storage limit modified!", 5000)
return false return false
if @loading.screen_visible and @inner_loaded and site_info.settings.size < site_info.size_limit*1024*1024 and site_info.settings.size > 0 # Loading screen still visible, but inner loaded if @loading.screen_visible and @inner_loaded and site_info.settings.size < site_info.size_limit * 1024 * 1024 and site_info.settings.size > 0 # Loading screen still visible, but inner loaded
@log "Loading screen visible, but inner loaded"
@loading.hideScreen() @loading.hideScreen()
if site_info?.settings?.own and site_info?.settings?.modified != @site_info?.settings?.modified if site_info?.settings?.own and site_info?.settings?.modified != @site_info?.settings?.modified
@updateModifiedPanel() @updateModifiedPanel()
if @loading.screen_visible and site_info.settings.size > site_info.size_limit * 1024 * 1024
@log "Site too large"
@loading.showTooLarge(site_info)
@site_info = site_info @site_info = site_info
@event_site_info.resolve() @event_site_info.resolve()