Get new wrapper nonce API command to proper reload iframe content
This commit is contained in:
parent
0e84bf95da
commit
af4b4ae85c
2 changed files with 13 additions and 5 deletions
|
@ -36,7 +36,7 @@ class UiWebsocket(object):
|
|||
self.send_queue = [] # Messages to send to client
|
||||
self.admin_commands = (
|
||||
"sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit",
|
||||
"channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "serverShowdirectory",
|
||||
"channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "serverShowdirectory", "serverGetWrapperNonce",
|
||||
"certSet", "configSet", "permissionAdd", "permissionRemove"
|
||||
)
|
||||
self.async_commands = ("fileGet", "fileList", "dirList", "fileNeed")
|
||||
|
@ -382,6 +382,10 @@ class UiWebsocket(object):
|
|||
ret = self.formatServerInfo()
|
||||
self.response(to, ret)
|
||||
|
||||
# Create a new wrapper nonce that allows to load html file
|
||||
def actionServerGetWrapperNonce(self, to):
|
||||
wrapper_nonce = self.request.getWrapperNonce()
|
||||
self.response(to, wrapper_nonce)
|
||||
|
||||
def actionAnnouncerInfo(self, to):
|
||||
ret = self.formatAnnouncerInfo(self.site)
|
||||
|
|
|
@ -545,12 +545,16 @@ class Wrapper
|
|||
return false
|
||||
@loading.printLine res
|
||||
@inner_loaded = false # Inner frame not loaded, just a 404 page displayed
|
||||
if reload
|
||||
src = $("iframe").attr("src")
|
||||
$("iframe").attr "src", ""
|
||||
$("iframe").attr "src", src
|
||||
if reload then @reloadIframe()
|
||||
return false
|
||||
|
||||
reloadIframe: =>
|
||||
src = $("iframe").attr("src")
|
||||
@ws.cmd "serverGetWrapperNonce", [], (wrapper_nonce) =>
|
||||
src = src.replace(/wrapper_nonce=[A-Za-z0-9]+/, "wrapper_nonce=" + wrapper_nonce)
|
||||
@log "Reloading iframe using url", src
|
||||
$("iframe").attr "src", src
|
||||
|
||||
log: (args...) ->
|
||||
console.log "[Wrapper]", args...
|
||||
|
||||
|
|
Loading…
Reference in a new issue