readme typo fix, donation bitcoin address added, force linux mergemedia path slashes, loading screen anim fix

This commit is contained in:
HelloZeroNet 2015-01-13 00:29:40 +01:00
parent ceb8ce6027
commit 4b02417b61
5 changed files with 913 additions and 903 deletions

View file

@ -33,7 +33,7 @@ def merge(merged_path):
# Merge files
parts = []
for file_path in findfiles(merge_dir, find_ext):
parts.append("\n\n/* ---- %s ---- */\n\n" % file_path)
parts.append("\n\n/* ---- %s ---- */\n\n" % file_path.replace("\\", "/"))
if file_path.endswith(".coffee"): # Compile coffee script
if not config.coffeescript_compiler:
logging.error("No coffeescript compiler definied, skipping compiling %s" % merged_path)

View file

@ -12,10 +12,11 @@ class Loading
# We dont need loadingscreen anymore
hideScreen: ->
if @screen_visible # Hide with animate
$(".loadingscreen").addClass("done").removeLater(2000)
else # Not visible, just remove
$(".loadingscreen").remove()
if not $(".loadingscreen").hasClass("done") # Nothing to do, just let the animtion to be finished
if @screen_visible # Hide with animate
$(".loadingscreen").addClass("done").removeLater(2000)
else # Not visible, just remove
$(".loadingscreen").remove()
@screen_visible = false

File diff suppressed because one or more lines are too long