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

Dont add data dir path to merged css file

Browse source
This commit is contained in:
HelloZeroNet 2016-04-10 13:25:41 +02:00
parent bbf1bc163d
commit 3a089ac512
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Debug/DebugMedia.py
View file

@ -75,9 +75,9 @@ def merge(merged_path):
parts = [] parts = []
s_total = time.time() s_total = time.time()
for file_path in findfiles(merge_dir, find_ext): 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(config.data_dir, ""))
if file_path.endswith(".coffee"): # Compile coffee script if file_path.endswith(".coffee"): # Compile coffee script
if file_path in changed or file_path not in old_parts: # Only recompile if changed or its not compiled before if file_path in changed or file_path.replace(config.data_dir, "") not in old_parts: # Only recompile if changed or its not compiled before
if config.coffeescript_compiler is None: if config.coffeescript_compiler is None:
config.coffeescript_compiler = findCoffeescriptCompiler() config.coffeescript_compiler = findCoffeescriptCompiler()
if not config.coffeescript_compiler: if not config.coffeescript_compiler:
@ -110,7 +110,7 @@ def merge(merged_path):
(file_path, re.escape(error).replace("\n", "\\n").replace(r"\\n", r"\n")) (file_path, re.escape(error).replace("\n", "\\n").replace(r"\\n", r"\n"))
) )
else: # Not changed use the old_part else: # Not changed use the old_part
parts.append(old_parts[file_path]) parts.append(old_parts[file_path.replace(config.data_dir, "")])
else: # Add to parts else: # Add to parts
parts.append(open(file_path).read().decode("utf8")) parts.append(open(file_path).read().decode("utf8"))