This commit is contained in:
Kovid Goyal 2014-05-11 10:02:02 +05:30
parent 94c324b317
commit f2f1c5d8d4

View File

@ -27,7 +27,7 @@ from calibre.gui2.viewer.table_popup import TablePopup
from calibre.gui2.viewer.inspector import WebInspector from calibre.gui2.viewer.inspector import WebInspector
from calibre.gui2.viewer.gestures import GestureHandler from calibre.gui2.viewer.gestures import GestureHandler
from calibre.ebooks.oeb.display.webview import load_html from calibre.ebooks.oeb.display.webview import load_html
from calibre.constants import isxp, iswindows from calibre.constants import isxp, iswindows, DEBUG
# }}} # }}}
def apply_settings(settings, opts): def apply_settings(settings, opts):
@ -364,10 +364,11 @@ class Document(QWebPage): # {{{
return ans return ans
def javaScriptConsoleMessage(self, msg, lineno, msgid): def javaScriptConsoleMessage(self, msg, lineno, msgid):
if DEBUG:
prints(msg) prints(msg)
def javaScriptAlert(self, frame, msg): def javaScriptAlert(self, frame, msg):
if self.debug_javascript: if DEBUG:
prints(msg) prints(msg)
else: else:
return QWebPage.javaScriptAlert(self, frame, msg) return QWebPage.javaScriptAlert(self, frame, msg)