rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pass around win_id so we can use it in the error message handler

Browse Source 
The message class needs a win_id to know where to send error messages. Just
pass it through the jinja->js->qtwebbridge as it's just a simple int.
This commit is contained in:
Brian Jackson 2014-11-25 11:19:00 -06:00
parent bf37d16896
commit 4fd4376c6a
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qutebrowser/config/config.py
View File

@ -520,12 +520,12 @@ class ConfigManager(QObject):
if self._initialized: if self._initialized:
self._after_set(sectname, optname) self._after_set(sectname, optname)
@pyqtSlot(str, str, str) @pyqtSlot(int, str, str, str)
def set_javascript(self, sectname, optname, value): def set_javascript(self, win_id, sectname, optname, value):
try: try:
self.set('conf', sectname, optname, value) self.set('conf', sectname, optname, value)
except configtypes.ValidationError as e: except configtypes.ValidationError as e:
message.error(e) message.error(win_id, e)
@cmdutils.register(instance='config') @cmdutils.register(instance='config')
def save(self): def save(self):

3
qutebrowser/html/settings.html
View File

@ -1,9 +1,10 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block script %} {% block script %}
var win_id = {{ win_id }};
var cset = function(section, option, el) { var cset = function(section, option, el) {
value = el.value; value = el.value;
window.qutesettings.set_javascript(section, option, value); window.qutesettings.set_javascript(win_id, section, option, value);
} }
{% endblock %} {% endblock %}

2
qutebrowser/network/qutescheme.py
View File

@ -156,7 +156,7 @@ def qute_settings(win_id, request):
frame.addToJavaScriptWindowObject("qutesettings", cfg) frame.addToJavaScriptWindowObject("qutesettings", cfg)
html = jinja.env.get_template('settings.html').render( html = jinja.env.get_template('settings.html').render(
title='settings', config=configdata, cfg=cfg) win_id=win_id, title='settings', config=configdata, cfg=cfg)
return html.encode('UTF-8', errors='xmlcharrefreplace') return html.encode('UTF-8', errors='xmlcharrefreplace')