diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-03-01 21:16:07 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2021-03-01 21:16:07 +0100 |
| commit | e7d365809e403d4a5866235999708becb37ff55d (patch) | |
| tree | 98e52743bb6a89561181b397d71827f2d41d8e4f /qutebrowser | |
| parent | a2a6ced79d7479c950bcf858daaf7fd738f111c0 (diff) | |
| parent | 985c2dea6560ff3d69c58a77256e624430296ae0 (diff) | |
| download | qutebrowser-e7d365809e403d4a5866235999708becb37ff55d.tar.gz qutebrowser-e7d365809e403d4a5866235999708becb37ff55d.zip | |
Merge remote-tracking branch 'origin/pr/6205'
Diffstat (limited to 'qutebrowser')
| -rw-r--r-- | qutebrowser/html/error.html | 12 | ||||
| -rw-r--r-- | qutebrowser/utils/jinja.py | 3 |
2 files changed, 2 insertions, 13 deletions
diff --git a/qutebrowser/html/error.html b/qutebrowser/html/error.html index 6bc5bac0d..975ae3aee 100644 --- a/qutebrowser/html/error.html +++ b/qutebrowser/html/error.html @@ -57,14 +57,6 @@ li { } {% endblock %} -{% block script %} -{{ super() }} -function tryagain() -{ - location.href = "{{ url|js_string_escape|safe }}"; -} -{% endblock %} - {% block content %} <div id="error-container"> <table> @@ -77,9 +69,7 @@ function tryagain() Error while opening {{ url | default('page', true) }}<br> <p id="error-message-text" style="color: #a31a1a;">{{ error }}</p><br><br> - <form name="bl"> - <input type="button" value="Try again" onclick="javascript:tryagain()" /> - </form> + <a href="{{ url }}">Try again</a> </td> </tr> </table> diff --git a/qutebrowser/utils/jinja.py b/qutebrowser/utils/jinja.py index 6ba11dd77..e5cd853aa 100644 --- a/qutebrowser/utils/jinja.py +++ b/qutebrowser/utils/jinja.py @@ -31,7 +31,7 @@ import jinja2 import jinja2.nodes from PyQt5.QtCore import QUrl -from qutebrowser.utils import utils, urlutils, log, qtutils, javascript +from qutebrowser.utils import utils, urlutils, log, qtutils from qutebrowser.misc import debugcachestats @@ -95,7 +95,6 @@ class Environment(jinja2.Environment): self.globals['file_url'] = urlutils.file_url self.globals['data_url'] = self._data_url self.globals['qcolor_to_qsscolor'] = qtutils.qcolor_to_qsscolor - self.filters['js_string_escape'] = javascript.string_escape self._autoescape = True @contextlib.contextmanager |