From bda31aea59fa5b694457d7abdb88ab3f9dfeb3bb Mon Sep 17 00:00:00 2001 From: shortcutme Date: Thu, 22 Feb 2018 23:34:18 +0100 Subject: [PATCH] Rev3337, Fix big site download button --- src/Config.py | 2 +- src/Ui/media/Loading.coffee | 7 ++++--- src/Ui/media/Wrapper.coffee | 2 +- src/Ui/media/all.js | 15 +++++++++------ 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/Config.py b/src/Config.py index 8085d5ce..9b650aae 100644 --- a/src/Config.py +++ b/src/Config.py @@ -10,7 +10,7 @@ class Config(object): def __init__(self, argv): self.version = "0.6.2" - self.rev = 3335 + self.rev = 3337 self.argv = argv self.action = None self.config_file = "zeronet.conf" diff --git a/src/Ui/media/Loading.coffee b/src/Ui/media/Loading.coffee index d0604b6f..57b973bb 100644 --- a/src/Ui/media/Loading.coffee +++ b/src/Ui/media/Loading.coffee @@ -1,5 +1,5 @@ class Loading - constructor: -> + constructor: (@wrapper) -> if window.show_loadingscreen then @showScreen() @timer_hide = null @@ -27,7 +27,8 @@ class Loading if $(".console .button-setlimit").length == 0 # Not displaying it yet line = @printLine("Site size: #{parseInt(site_info.settings.size/1024/1024)}MB is larger than default allowed #{parseInt(site_info.size_limit)}MB", "warning") button = $("" + "Open site and set size limit to #{site_info.next_size_limit}MB" + "") - button.on "click", (-> return window.wrapper.setSizeLimit(site_info.next_size_limit) ) + button.on "click", => + return @wrapper.setSizeLimit(site_info.next_size_limit) line.after(button) setTimeout (=> @printLine('Ready.') @@ -67,4 +68,4 @@ class Loading -window.Loading = Loading \ No newline at end of file +window.Loading = Loading diff --git a/src/Ui/media/Wrapper.coffee b/src/Ui/media/Wrapper.coffee index 39e05dbb..584f1f0e 100644 --- a/src/Ui/media/Wrapper.coffee +++ b/src/Ui/media/Wrapper.coffee @@ -2,7 +2,7 @@ class Wrapper constructor: (ws_url) -> @log "Created!" - @loading = new Loading() + @loading = new Loading(@) @notifications = new Notifications($(".notifications")) @fixbutton = new Fixbutton() diff --git a/src/Ui/media/all.js b/src/Ui/media/all.js index 128d46df..08c21c28 100644 --- a/src/Ui/media/all.js +++ b/src/Ui/media/all.js @@ -574,7 +574,8 @@ jQuery.extend( jQuery.easing, var Loading; Loading = (function() { - function Loading() { + function Loading(wrapper) { + this.wrapper = wrapper; if (window.show_loadingscreen) { this.showScreen(); } @@ -610,9 +611,11 @@ jQuery.extend( jQuery.easing, if ($(".console .button-setlimit").length === 0) { line = this.printLine("Site size: " + (parseInt(site_info.settings.size / 1024 / 1024)) + "MB is larger than default allowed " + (parseInt(site_info.size_limit)) + "MB", "warning"); button = $("" + ("Open site and set size limit to " + site_info.next_size_limit + "MB") + ""); - button.on("click", (function() { - return window.wrapper.setSizeLimit(site_info.next_size_limit); - })); + button.on("click", (function(_this) { + return function() { + return _this.wrapper.setSizeLimit(site_info.next_size_limit); + }; + })(this)); line.after(button); return setTimeout(((function(_this) { return function() { @@ -680,6 +683,7 @@ jQuery.extend( jQuery.easing, }).call(this); + /* ---- src/Ui/media/Notifications.coffee ---- */ @@ -830,7 +834,7 @@ jQuery.extend( jQuery.easing, this.onMessageWebsocket = bind(this.onMessageWebsocket, this); this.verifyEvent = bind(this.verifyEvent, this); this.log("Created!"); - this.loading = new Loading(); + this.loading = new Loading(this); this.notifications = new Notifications($(".notifications")); this.fixbutton = new Fixbutton(); window.addEventListener("message", this.onMessageInner, false); @@ -1618,7 +1622,6 @@ jQuery.extend( jQuery.easing, }).call(this); - /* ---- src/Ui/media/WrapperZeroFrame.coffee ---- */