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

rev357, Coffeescript compiler autodetect on linux, Fix loading screen hide on 0 sized sites

Browse source
This commit is contained in:
HelloZeroNet 2015-08-26 02:51:32 +02:00
parent b83d6ba2ff
commit dd2bb8b3fb
5 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Ui/media/Notifications.coffee
View file

@ -13,6 +13,7 @@ class Notifications
add: (id, type, body, timeout=0) ->
id = id.replace /[^A-Za-z0-9]/g, ""
# Close notifications with same id
for elem in $(".notification-#{id}")
@close $(elem)

5
src/Ui/media/Wrapper.coffee
View file

@ -31,9 +31,6 @@ class Wrapper
src = $("#inner-iframe").attr("src").replace(/#.*/, "")+window.location.hash
$("#inner-iframe").attr("src", src)
###setInterval (->
console.log document.hasFocus()
), 1000###
$("#inner-iframe").focus()
@
@ -303,7 +300,7 @@ class Wrapper
@notifications.add("size_limit", "done", res, 5000)
return false
if @loading.screen_visible and @inner_loaded and site_info.settings.size < site_info.size_limit*1024*1024 # Loading screen still visible, but inner loaded
if @loading.screen_visible and @inner_loaded and site_info.settings.size < site_info.size_limit*1024*1024 and site_info.settings.size > 0 # Loading screen still visible, but inner loaded
@loading.hideScreen()
if site_info.tasks > 0 and site_info.started_task_num > 0

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

@ -666,6 +666,7 @@ jQuery.extend( jQuery.easing,
if (timeout == null) {
timeout = 0;
}
id = id.replace(/[^A-Za-z0-9]/g, "");
_ref = $(".notification-" + id);
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
elem = _ref[_i];
@ -801,11 +802,6 @@ jQuery.extend( jQuery.easing,
}
};
})(this));
/*setInterval (->
console.log document.hasFocus()
), 1000
*/
$("#inner-iframe").focus();
this;
}
@ -1160,7 +1156,7 @@ jQuery.extend( jQuery.easing,
})(this));
}
}
if (this.loading.screen_visible && this.inner_loaded && site_info.settings.size < site_info.size_limit * 1024 * 1024) {
if (this.loading.screen_visible && this.inner_loaded && site_info.settings.size < site_info.size_limit * 1024 * 1024 && site_info.settings.size > 0) {
this.loading.hideScreen();
}
if (site_info.tasks > 0 && site_info.started_task_num > 0) {