From 3c4cb3f492864aa0cff8bf8e05f94367c98de79e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 24 Jun 2012 10:29:20 +0530 Subject: [PATCH] Do not output unneccessary error messages from viewer when it is unintialized --- src/calibre/gui2/viewer/documentview.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py index 8c6da27d71..dc7b557f3c 100644 --- a/src/calibre/gui2/viewer/documentview.py +++ b/src/calibre/gui2/viewer/documentview.py @@ -205,6 +205,8 @@ class Document(QWebPage): # {{{ return self.anchor_positions def switch_to_paged_mode(self, onresize=False): + if onresize and not self.loaded_javascript: + return side_margin = self.javascript('window.paged_display.layout()', typ=int) # Setup the contents size to ensure that there is a right most margin. # Without this webkit renders the final column with no margin, as the @@ -294,6 +296,7 @@ class Document(QWebPage): # {{{ self.mainFrame().setScrollPosition(QPoint(x, y)) def jump_to_anchor(self, anchor): + if not self.loaded_javascript: return self.javascript('window.paged_display.jump_to_anchor("%s")'%anchor) def element_ypos(self, elem): @@ -352,7 +355,7 @@ class Document(QWebPage): # {{{ except ZeroDivisionError: return 0. def fset(self, val): - if self.in_paged_mode: + if self.in_paged_mode and self.loaded_javascript: self.javascript('paged_display.scroll_to_pos(%f)'%val) else: npos = val * (self.height - self.window_height)