Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Loading resources now works

Browse Source
This commit is contained in:
Kovid Goyal 2018-09-25 10:35:56 +05:30
parent a2fd1ca90f
commit f721d49e32
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pyj/viewer-main.pyj
View File

@ -26,7 +26,7 @@ book = None
view = None view = None
def file_received(name, proceed, end_type, xhr, ev): def file_received(name, file_data, proceed, end_type, xhr, ev):
if end_type is 'abort': if end_type is 'abort':
return return
if end_type is not 'load': if end_type is not 'load':
@ -35,20 +35,24 @@ def file_received(name, proceed, end_type, xhr, ev):
return return
if not xhr.responseType or xhr.responseType is 'text': if not xhr.responseType or xhr.responseType is 'text':
result = xhr.responseText result = xhr.responseText
mt = xhr.getResponseHeader('Content-Type')
else if xhr.responseType is 'blob': else if xhr.responseType is 'blob':
result = xhr.response result = xhr.response
mt = result.type
else: else:
show_error(_('Failed to load file from book'), _( show_error(_('Failed to load file from book'), _(
'Could not load the file: {} unknown response type: {}').format(name, xhr.responseType)) 'Could not load the file: {} unknown response type: {}').format(name, xhr.responseType))
return return
proceed(result, name, mt, book) proceed(result, name, file_data.mimetype, book)
def get_file(book, name, proceed): def get_file(book, name, proceed):
ajax('book/' + name, file_received.bind(None, name, proceed), ok_code=0).send() entry = book.manifest.files[name]
xhr = ajax('book/' + name, file_received.bind(None, name, entry, proceed), ok_code=0)
if entry.is_html or entry.mimetype.startswith('text/') or entry.mimetype is 'application/javascript':
xhr.responseType = 'text'
else:
xhr.responseType = 'blob'
xhr.send()
def get_mathjax_files(proceed): def get_mathjax_files(proceed):