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

py3: Port uses of compiled_coffeescript to load JS

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-10 21:18:41 +05:30
parent edfff91424
commit 12fefdd7b1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/ebooks/pdf/render/from_html.py
View File

@ -390,10 +390,10 @@ class PDFWriter(QObject):
if self.paged_js is None: if self.paged_js is None:
import uuid import uuid
from calibre.utils.resources import compiled_coffeescript as cc from calibre.utils.resources import compiled_coffeescript as cc
self.paged_js = cc('ebooks.oeb.display.utils') self.paged_js = cc('ebooks.oeb.display.utils').decode('utf-8')
self.paged_js += cc('ebooks.oeb.display.indexing') self.paged_js += cc('ebooks.oeb.display.indexing').decode('utf-8')
self.paged_js += cc('ebooks.oeb.display.paged') self.paged_js += cc('ebooks.oeb.display.paged').decode('utf-8')
self.paged_js += cc('ebooks.oeb.display.mathjax') self.paged_js += cc('ebooks.oeb.display.mathjax').decode('utf-8')
if self.opts.pdf_hyphenate: if self.opts.pdf_hyphenate:
self.paged_js += P('viewer/hyphenate/Hyphenator.js', data=True).decode('utf-8') self.paged_js += P('viewer/hyphenate/Hyphenator.js', data=True).decode('utf-8')
hjs, self.hyphenate_lang = load_hyphenator_dicts({}, self.book_language) hjs, self.hyphenate_lang = load_hyphenator_dicts({}, self.book_language)

2
src/calibre/gui2/toc/location.py
View File

@ -57,6 +57,8 @@ class Page(QWebPage): # {{{
from calibre.utils.resources import compiled_coffeescript from calibre.utils.resources import compiled_coffeescript
self.js = compiled_coffeescript('ebooks.oeb.display.utils') self.js = compiled_coffeescript('ebooks.oeb.display.utils')
self.js += compiled_coffeescript('ebooks.oeb.polish.choose') self.js += compiled_coffeescript('ebooks.oeb.polish.choose')
if isinstance(self.js, bytes):
self.js = self.js.decode('utf-8')
self.mainFrame().addToJavaScriptWindowObject("py_bridge", self) self.mainFrame().addToJavaScriptWindowObject("py_bridge", self)
self.evaljs(self.js) self.evaljs(self.js)
# }}} # }}}

2
src/calibre/gui2/tweak_book/preview.py
View File

@ -286,6 +286,8 @@ class WebPage(QWebPage):
self.js = compiled_coffeescript('ebooks.oeb.display.utils', dynamic=False) self.js = compiled_coffeescript('ebooks.oeb.display.utils', dynamic=False)
self.js += P('csscolorparser.js', data=True, allow_user_override=False) self.js += P('csscolorparser.js', data=True, allow_user_override=False)
self.js += compiled_coffeescript('ebooks.oeb.polish.preview', dynamic=False) self.js += compiled_coffeescript('ebooks.oeb.polish.preview', dynamic=False)
if isinstance(self.js, bytes):
self.js = self.js.decode('utf-8')
self._line_numbers = None self._line_numbers = None
mf = self.mainFrame() mf = self.mainFrame()
mf.addToJavaScriptWindowObject("py_bridge", self) mf.addToJavaScriptWindowObject("py_bridge", self)