vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fixed file encoding at render js

Browse source
This commit is contained in:
Achilles Rasquinha 2018-02-13 13:23:24 +05:30
parent 926ccbe3dc
commit 0cc8feb17c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/website/router.py
View file

@ -7,6 +7,7 @@ import frappe, os
from frappe.website.utils import can_cache, delete_page_cache, extract_title
from frappe.model.document import get_controller
from six import text_type
import io
def resolve_route(path):
"""Returns the page route object based on searching in pages and generators.
@ -245,7 +246,8 @@ def setup_source(page_info):
js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
if os.path.exists(js_path):
if not '{% block script %}' in html:
js = text_type(open(js_path, 'r').read(), 'utf-8')
with io.open(js_path, 'r', encoding = 'utf-8') as f:
js = f.read()
html += '\n{% block script %}<script>' + js + '\n</script>\n{% endblock %}'
css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')