diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py index 41cd6433ca..17ad36f908 100644 --- a/src/calibre/gui2/viewer/documentview.py +++ b/src/calibre/gui2/viewer/documentview.py @@ -29,7 +29,7 @@ from calibre.ebooks.oeb.display.webview import load_html from calibre.constants import isxp, iswindows # }}} -class Document(QWebPage): # {{{ +class Document(QWebPage): # {{{ page_turn = pyqtSignal(object) mark_element = pyqtSignal(QWebElement) @@ -356,7 +356,8 @@ class Document(QWebPage): # {{{ self.mainFrame().setScrollPosition(QPoint(x, y)) def jump_to_anchor(self, anchor): - if not self.loaded_javascript: return + if not self.loaded_javascript: + return self.javascript('window.paged_display.jump_to_anchor("%s")'%anchor) def element_ypos(self, elem): @@ -447,7 +448,7 @@ class Document(QWebPage): # {{{ @property def width(self): - return self.mainFrame().contentsSize().width() # offsetWidth gives inaccurate results + return self.mainFrame().contentsSize().width() # offsetWidth gives inaccurate results def set_bottom_padding(self, amount): s = QSize(-1, -1) if amount == 0 else QSize(self.viewportSize().width(), @@ -460,7 +461,7 @@ class Document(QWebPage): # {{{ # }}} -class DocumentView(QWebView): # {{{ +class DocumentView(QWebView): # {{{ magnification_changed = pyqtSignal(object) DISABLED_BRUSH = QBrush(Qt.lightGray, Qt.Dense5Pattern) @@ -766,8 +767,10 @@ class DocumentView(QWebView): # {{{ @dynamic_property def current_language(self): - def fget(self): return self.document.current_language - def fset(self, val): self.document.current_language = val + def fget(self): + return self.document.current_language + def fset(self, val): + self.document.current_language = val return property(fget=fget, fset=fset) def search(self, text, backwards=False): @@ -816,7 +819,6 @@ class DocumentView(QWebView): # {{{ self.scrollbar.blockSignals(False) self._ignore_scrollbar_signals = False - def load_finished(self, ok): if self.loading_url is None: # An