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

Peer number get bugfix, Loading screen always wait for filedone event

Browse source
This commit is contained in:
HelloZeroNet 2015-02-14 14:54:11 +01:00
parent fa7164a0f0
commit 655607466c
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -943,9 +943,6 @@ jQuery.extend( jQuery.easing,
"cmd": "wrapperReady"
});
}
if (!this.site_error) {
this.loading.hideScreen();
}
if (window.location.hash) {
$("#inner-iframe")[0].src += window.location.hash;
}
@ -1020,7 +1017,7 @@ jQuery.extend( jQuery.easing,
this.loading.printLine("No peers found");
}
}
if (!this.site_info && $("#inner-iframe").attr("src").indexOf("?") === -1) {
if (!this.site_info && !this.loading.screen_visible && $("#inner-iframe").attr("src").indexOf("?") === -1) {
if (site_info.size_limit < site_info.next_size_limit) {
this.wrapperConfirm("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() {