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

Take text as pos. argument for _build_question

Browse Source
This commit is contained in:
Florian Bruhin 2016-10-04 11:12:22 +02:00
parent 6d7748f05f
commit 75bb2265be
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qutebrowser/browser/webkit/webpage.py
View File

@ -99,7 +99,8 @@ class BrowserPage(QWebPage):
config.get('content', 'ignore-javascript-prompt')): config.get('content', 'ignore-javascript-prompt')):
return (False, "") return (False, "")
answer = message.ask(self._win_id, 'Javascript prompt', msg, answer = message.ask(self._win_id, 'Javascript prompt', msg,
usertypes.PromptMode.text, default=default, mode=usertypes.PromptMode.text,
default=default,
abort_on=[self.loadStarted, abort_on=[self.loadStarted,
self.shutting_down]) self.shutting_down])
if answer is None: if answer is None:
@ -451,7 +452,7 @@ class BrowserPage(QWebPage):
config.get('content', 'ignore-javascript-alert')): config.get('content', 'ignore-javascript-alert')):
return return
message.ask(self._win_id, 'Javascript alert', msg, message.ask(self._win_id, 'Javascript alert', msg,
usertypes.PromptMode.alert, mode=usertypes.PromptMode.alert,
abort_on=[self.loadStarted, self.shutting_down]) abort_on=[self.loadStarted, self.shutting_down])
def javaScriptConfirm(self, frame, msg): def javaScriptConfirm(self, frame, msg):
@ -463,7 +464,7 @@ class BrowserPage(QWebPage):
if self._is_shutting_down: if self._is_shutting_down:
return False return False
ans = message.ask(self._win_id, 'Javascript confirm', msg, ans = message.ask(self._win_id, 'Javascript confirm', msg,
usertypes.PromptMode.yesno, mode=usertypes.PromptMode.yesno,
abort_on=[self.loadStarted, self.shutting_down]) abort_on=[self.loadStarted, self.shutting_down])
return bool(ans) return bool(ans)

2
qutebrowser/mainwindow/mainwindow.py
View File

@ -521,7 +521,7 @@ class MainWindow(QWidget):
if quit_texts or 'always' in confirm_quit: if quit_texts or 'always' in confirm_quit:
text = '\n'.join(['Really quit?'] + quit_texts) text = '\n'.join(['Really quit?'] + quit_texts)
confirmed = message.ask(self.win_id, text, confirmed = message.ask(self.win_id, text,
usertypes.PromptMode.yesno, mode=usertypes.PromptMode.yesno,
default=True) default=True)
# Stop asking if the user cancels # Stop asking if the user cancels
if not confirmed: if not confirmed:

4
qutebrowser/utils/message.py
View File

@ -76,7 +76,7 @@ def info(message):
global_bridge.show_message.emit(usertypes.MessageLevel.info, message) global_bridge.show_message.emit(usertypes.MessageLevel.info, message)
def _build_question(title, mode, *, default=None, text=None, abort_on=()): def _build_question(title, text=None, *, mode, default=None, abort_on=()):
"""Common function for ask/ask_async.""" """Common function for ask/ask_async."""
if not isinstance(mode, usertypes.PromptMode): if not isinstance(mode, usertypes.PromptMode):
raise TypeError("Mode {} is no PromptMode member!".format(mode)) raise TypeError("Mode {} is no PromptMode member!".format(mode))
@ -123,7 +123,7 @@ def ask_async(win_id, text, mode, handler, **kwargs):
default: The default value to display. default: The default value to display.
text: Additional text to show. text: Additional text to show.
""" """
question = _build_question(text, mode, **kwargs) question = _build_question(text, mode=mode, **kwargs)
question.answered.connect(handler) question.answered.connect(handler)
question.completed.connect(question.deleteLater) question.completed.connect(question.deleteLater)
bridge = objreg.get('message-bridge', scope='window', window=win_id) bridge = objreg.get('message-bridge', scope='window', window=win_id)