From 85eea17b183751a89ddc8bb4bb82a3a0ccdf5ba5 Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@arp242.net>
Date: Wed, 3 Jun 2015 22:31:15 +0200
Subject: [PATCH] Try to get the error ... not sure about this ...

source is undefined when you type stuff in the console, I *think* this is the
only scenario? But maybe not?

<script>
setInterval(function() {
	if (window.__qute_jseval__) {
		throw new Error('jseval hack failed. Sorry :-( ' + window.__qute_jseval__);
	}
}, 1);
</script>
---
 qutebrowser/browser/commands.py | 20 ++++++++++++++++++++
 qutebrowser/browser/webpage.py  | 11 +++++++++++
 qutebrowser/misc/utilcmds.py    | 13 -------------
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 0c01260d7..bc2159843 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1510,3 +1510,23 @@ class CommandDispatcher:
         view = self._current_widget()
         for _ in range(count):
             view.triggerPageAction(member)
+
+    @cmdutils.register(instance='command-dispatcher', scope='window',
+                       maxsplit=0, no_cmd_split=True)
+    def jseval(self, js):
+        """Evaluate a JavaScript string.
+
+        Args:
+            s: The string to evaluate.
+        """
+        tabbed_browser = objreg.get('tabbed-browser', scope='window',
+                                    window='last-focused')
+        out = tabbed_browser.widget(0).page().mainFrame().evaluateJavaScript(
+            'window.__qute_jseval__ = true;\n' + js)
+
+        if out is not None:
+            message.info(self._win_id, out)
+        elif tabbed_browser.widget(0).page().jseval_error:
+            message.error(self._win_id,
+                          tabbed_browser.widget(0).page().jseval_error)
+            tabbed_browser.widget(0).page().jseval_error = None
diff --git a/qutebrowser/browser/webpage.py b/qutebrowser/browser/webpage.py
index 005a6e300..9e49032df 100644
--- a/qutebrowser/browser/webpage.py
+++ b/qutebrowser/browser/webpage.py
@@ -63,6 +63,7 @@ class BrowserPage(QWebPage):
     def __init__(self, win_id, tab_id, parent=None):
         super().__init__(parent)
         self._win_id = win_id
+        self.jseval_error = None
         self._is_shutting_down = False
         self._extension_handlers = {
             QWebPage.ErrorPageExtension: self._handle_errorpage,
@@ -497,6 +498,16 @@ class BrowserPage(QWebPage):
 
     def javaScriptConsoleMessage(self, msg, line, source):
         """Override javaScriptConsoleMessage to use debug log."""
+        
+        jseval = self.mainFrame().evaluateJavaScript('window.__qute_jseval__')
+        if jseval:
+            self.mainFrame().evaluateJavaScript('window.__qute_jseval__ = undefined;')
+        if source == 'undefined' and jseval:
+            self.mainFrame().evaluateJavaScript('window.__qute_jseval__ = false;')
+            print('jseval errror ->', jseval)
+            self.jseval_error = 'Error on line {}: {}'.format(line, msg)
+        print('other js error ->', msg, line, source)
+
         if config.get('general', 'log-javascript-console'):
             log.js.debug("[{}:{}] {}".format(source, line, msg))
 
diff --git a/qutebrowser/misc/utilcmds.py b/qutebrowser/misc/utilcmds.py
index 1c7e40d99..ea6fdf1cc 100644
--- a/qutebrowser/misc/utilcmds.py
+++ b/qutebrowser/misc/utilcmds.py
@@ -111,19 +111,6 @@ def message_warning(win_id, text):
     message.warning(win_id, text)
 
 
-@cmdutils.register(maxsplit=0, no_cmd_split=True)
-def jseval(s):
-    """Evaluate a JavaScript string.
-
-    Args:
-        s: The string to evaluate.
-    """
-    tabbed_browser = objreg.get('tabbed-browser', scope='window',
-                                window='last-focused')
-    message_info(tabbed_browser.widget(0)
-                 .page().mainFrame().evaluateJavaScript(s))
-
-
 @cmdutils.register(debug=True)
 def debug_crash(typ: {'type': ('exception', 'segfault')}='exception'):
     """Crash for debugging purposes.