Skip to content

Commit

Permalink
RenderWrapper showloadingscreen parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
shortcutme committed May 11, 2017
1 parent 27a5826 commit 5908d2c
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/Ui/UiRequest.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,13 @@ def actionWrapper(self, path, extra_headers=None):
else: # Bad url
return False

def renderWrapper(self, site, path, inner_path, title, extra_headers):
def getSiteUrl(self, address):
if self.isProxyRequest():
return "http://zero/" + address
else:
return "/" + address

def renderWrapper(self, site, path, inner_path, title, extra_headers, show_loadingscreen=None):
file_inner_path = inner_path
if not file_inner_path:
file_inner_path = "index.html" # If inner path defaults to index.html
Expand Down Expand Up @@ -300,6 +300,9 @@ def getSiteUrl(self, address):
else:
sandbox_permissions = ""

if show_loadingscreen is None:
show_loadingscreen = not site.storage.isFile(file_inner_path)

return self.render(
"src/Ui/template/wrapper.html",
server_url=server_url,
Expand All @@ -315,7 +318,7 @@ def getSiteUrl(self, address):
wrapper_nonce=wrapper_nonce,
postmessage_nonce_security=postmessage_nonce_security,
permissions=json.dumps(site.settings["permissions"]),
show_loadingscreen=json.dumps(not site.storage.isFile(file_inner_path)),
show_loadingscreen=json.dumps(show_loadingscreen),
sandbox_permissions=sandbox_permissions,
rev=config.rev,
lang=config.language,
Expand Down

0 comments on commit 5908d2c

Please sign in to comment.