diff --git a/src/Config.py b/src/Config.py index 4fd29a02..76ff0ce3 100644 --- a/src/Config.py +++ b/src/Config.py @@ -8,7 +8,7 @@ class Config(object): def __init__(self, argv): self.version = "0.3.2" - self.rev = 470 + self.rev = 472 self.argv = argv self.action = None self.createParser() diff --git a/src/Ui/media/Wrapper.coffee b/src/Ui/media/Wrapper.coffee index 4625a99c..b832c87b 100644 --- a/src/Ui/media/Wrapper.coffee +++ b/src/Ui/media/Wrapper.coffee @@ -296,7 +296,7 @@ class Wrapper @site_error = "No peers found" @loading.printLine "No peers found" - if not @site_info and not @loading.screen_visible and $("#inner-iframe").attr("src").replace("?wrapper=False", "").indexOf("?") == -1 # First site info and mainpage + if not @site_info and not @loading.screen_visible and $("#inner-iframe").attr("src").replace("?wrapper=False", "").replace(/\?wrapper_nonce=[A-Za-z0-9]+/, "").indexOf("?") == -1 # First site info and we are on mainpage (does not have other parameter thatn wrapper) if site_info.size_limit*1.1 < site_info.next_size_limit # Need upgrade soon @displayConfirm "Running out of size limit (#{(site_info.settings.size/1024/1024).toFixed(1)}MB/#{site_info.size_limit}MB)", "Set limit to #{site_info.next_size_limit}MB", => @ws.cmd "siteSetLimit", [site_info.next_size_limit], (res) => diff --git a/src/Ui/media/all.js b/src/Ui/media/all.js index a18312fb..6d12c7fb 100644 --- a/src/Ui/media/all.js +++ b/src/Ui/media/all.js @@ -149,7 +149,6 @@ }).call(this); - /* ---- src/Ui/media/lib/jquery.cssanim.js ---- */ @@ -257,7 +256,6 @@ if (window.getComputedStyle(document.body).transform) { }).call(this); - /* ---- src/Ui/media/lib/jquery.easing.1.3.js ---- */ @@ -523,7 +521,6 @@ jQuery.extend( jQuery.easing, }).call(this); - /* ---- src/Ui/media/Loading.coffee ---- */ @@ -627,7 +624,6 @@ jQuery.extend( jQuery.easing, }).call(this); - /* ---- src/Ui/media/Notifications.coffee ---- */ @@ -747,7 +743,6 @@ jQuery.extend( jQuery.easing, }).call(this); - /* ---- src/Ui/media/Wrapper.coffee ---- */ @@ -1142,7 +1137,7 @@ jQuery.extend( jQuery.easing, this.loading.printLine("No peers found"); } } - if (!this.site_info && !this.loading.screen_visible && $("#inner-iframe").attr("src").replace("?wrapper=False", "").indexOf("?") === -1) { + if (!this.site_info && !this.loading.screen_visible && $("#inner-iframe").attr("src").replace("?wrapper=False", "").replace(/\?wrapper_nonce=[A-Za-z0-9]+/, "").indexOf("?") === -1) { if (site_info.size_limit * 1.1 < site_info.next_size_limit) { this.displayConfirm("Running out of size limit (" + ((site_info.settings.size / 1024 / 1024).toFixed(1)) + "MB/" + site_info.size_limit + "MB)", "Set limit to " + site_info.next_size_limit + "MB", (function(_this) { return function() {