diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index 9adad19ec..198ccf9fd 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -196,11 +196,6 @@ DATA = OrderedDict([ SettingValue(types.Bool(), 'false'), "Whether to open new tabs (middleclick/ctrl+click) in background."), - ('window-open-behaviour', - SettingValue(types.WindowOpenBehaviour(), 'new-tab'), - "What to do when the WebView requests a new window to be opened " - "(e.g. via javascript)."), - ('editor', SettingValue(types.ShellCommand(placeholder=True), 'gvim -f "{}"'), "The editor (and arguments) to use for the open-editor binding. " diff --git a/qutebrowser/config/conftypes.py b/qutebrowser/config/conftypes.py index 4e6519c4a..0b850d958 100644 --- a/qutebrowser/config/conftypes.py +++ b/qutebrowser/config/conftypes.py @@ -911,15 +911,6 @@ class AcceptCookies(BaseType): ('never', "Don't accept cookies at all.")) -class WindowOpenBehaviour(BaseType): - - """What to do when a webview requests a new window.""" - - valid_values = ValidValues(('same-tab', "Open new window in same tab."), - ('new-tab', "Open new window in new tab (note: " - "history will be cleared).")) - - class ConfirmQuit(BaseType): """Whether to display a confirmation when the window is closed.""" diff --git a/qutebrowser/widgets/webview.py b/qutebrowser/widgets/webview.py index 01f938c8a..36d286cbb 100644 --- a/qutebrowser/widgets/webview.py +++ b/qutebrowser/widgets/webview.py @@ -437,12 +437,7 @@ class WebView(QWebView): if wintype == QWebPage.WebModalDialog: log.webview.warning("WebModalDialog requested, but we don't " "support that!") - if config.get('general', 'window-open-behaviour') == 'new-tab': - return self.tabbedbrowser.tabopen() - else: - # FIXME for some odd reason, the history of the tab gets killed - # here... - return self + return self.tabbedbrowser.tabopen() def paintEvent(self, e): """Extend paintEvent to emit a signal if the scroll position changed.