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

Merge wrapper js

Browse source
This commit is contained in:
shortcutme 2018-11-26 00:05:17 +01:00
parent 233e161327
commit cbefc5b81e
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Ui/media/all.js
View file

@ -908,7 +908,7 @@ $.extend( $.easing,
}; };
Wrapper.prototype.onMessageWebsocket = function(e) { Wrapper.prototype.onMessageWebsocket = function(e) {
var cmd, id, message, ref, type; var cmd, id, message, ref, script_tag, type;
message = JSON.parse(e.data); message = JSON.parse(e.data);
cmd = message.cmd; cmd = message.cmd;
if (cmd === "response") { if (cmd === "response") {
@ -955,8 +955,15 @@ $.extend( $.easing,
} else if (cmd === "updating") { } else if (cmd === "updating") {
this.ws.ws.close(); this.ws.ws.close();
return this.ws.onCloseWebsocket(null, 4000); return this.ws.onCloseWebsocket(null, 4000);
} else if (cmd === "redirect") {
return window.top.location = message.params;
} else if (cmd === "injectHtml") { } else if (cmd === "injectHtml") {
return $("body").append(message.params); return $("body").append(message.params);
} else if (cmd === "injectScript") {
script_tag = $("<script>");
script_tag.attr("nonce", this.script_nonce);
script_tag.html(message.params);
return document.head.appendChild(script_tag[0]);
} else { } else {
return this.sendInner(message); return this.sendInner(message);
} }
@ -1475,8 +1482,11 @@ $.extend( $.easing,
}; };
Wrapper.prototype.onWrapperLoad = function() { Wrapper.prototype.onWrapperLoad = function() {
this.script_nonce = window.script_nonce;
this.wrapper_key = window.wrapper_key;
delete window.wrapper; delete window.wrapper;
delete window.wrapper_key; delete window.wrapper_key;
delete window.script_nonce;
return $("#script_init").remove(); return $("#script_init").remove();
}; };