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

Rename content.javascript.can_*_windows to _tabs

Browse Source
This commit is contained in:
Florian Bruhin 2017-07-03 16:04:17 +02:00
parent be94098597
commit a36f5bafc1
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/browser/webengine/webenginesettings.py
View File

@ -240,7 +240,7 @@ MAPPINGS = {
Attribute(QWebEngineSettings.AutoLoadImages), Attribute(QWebEngineSettings.AutoLoadImages),
'content.javascript.enabled': 'content.javascript.enabled':
Attribute(QWebEngineSettings.JavascriptEnabled), Attribute(QWebEngineSettings.JavascriptEnabled),
'content.javascript.can_open_windows_automatically': 'content.javascript.can_open_tabs_automatically':
Attribute(QWebEngineSettings.JavascriptCanOpenWindows), Attribute(QWebEngineSettings.JavascriptCanOpenWindows),
'content.javascript.can_access_clipboard': 'content.javascript.can_access_clipboard':
Attribute(QWebEngineSettings.JavascriptCanAccessClipboard), Attribute(QWebEngineSettings.JavascriptCanAccessClipboard),

4
qutebrowser/browser/webkit/webkitsettings.py
View File

@ -155,9 +155,9 @@ MAPPINGS = {
Attribute(QWebSettings.AutoLoadImages), Attribute(QWebSettings.AutoLoadImages),
'content.javascript.enabled': 'content.javascript.enabled':
Attribute(QWebSettings.JavascriptEnabled), Attribute(QWebSettings.JavascriptEnabled),
'content.javascript.can_open_windows_automatically': 'content.javascript.can_open_tabs_automatically':
Attribute(QWebSettings.JavascriptCanOpenWindows), Attribute(QWebSettings.JavascriptCanOpenWindows),
'content.javascript.can_close_windows': 'content.javascript.can_close_tabs':
Attribute(QWebSettings.JavascriptCanCloseWindows), Attribute(QWebSettings.JavascriptCanCloseWindows),
'content.javascript.can_access_clipboard': 'content.javascript.can_access_clipboard':
Attribute(QWebSettings.JavascriptCanAccessClipboard), Attribute(QWebSettings.JavascriptCanAccessClipboard),

9
qutebrowser/config/configdata.yml
View File

@ -368,17 +368,16 @@ content.javascript.can_access_clipboard:
With QtWebEngine, writing the clipboard as response to a user interaction is With QtWebEngine, writing the clipboard as response to a user interaction is
always allowed. always allowed.
content.javascript.can_close_windows: content.javascript.can_close_tabs:
default: false default: false
type: Bool type: Bool
backend: QtWebKit backend: QtWebKit
desc: Whether JavaScript programs can close windows. desc: Whether JavaScript can close tabs.
content.javascript.can_open_windows_automatically: content.javascript.can_open_tabs_automatically:
default: false default: false
type: Bool type: Bool
desc: Whether JavaScript programs can open new windows without user desc: Whether JavaScript can open new tabs without user interaction.
interaction.
content.javascript.enabled: content.javascript.enabled:
default: true default: true

8
tests/end2end/features/javascript.feature
View File

@ -55,16 +55,16 @@ Feature: Javascript stuff
And I wait for "Focus object changed: *" in the log And I wait for "Focus object changed: *" in the log
Then no crash should happen Then no crash should happen
Scenario: Opening window without user interaction with javascript-can-open-windows-automatically set to true Scenario: Opening window without user interaction with javascript-can-open-tabs-automatically set to true
When I open data/hello.txt When I open data/hello.txt
And I set content.javascript.can_open_windows_automatically to true And I set content.javascript.can_open_tabs_automatically to true
And I run :tab-only And I run :tab-only
And I run :jseval if (window.open('about:blank')) { console.log('window opened'); } else { console.log('error while opening window'); } And I run :jseval if (window.open('about:blank')) { console.log('window opened'); } else { console.log('error while opening window'); }
Then the javascript message "window opened" should be logged Then the javascript message "window opened" should be logged
Scenario: Opening window without user interaction with javascript-can-open-windows-automatically set to false Scenario: Opening window without user interaction with javascript-can-open-tabs-automatically set to false
When I open data/hello.txt When I open data/hello.txt
And I set content.javascript.can_open_windows_automatically to false And I set content.javascript.can_open_tabs_automatically to false
And I run :tab-only And I run :tab-only
And I run :jseval if (window.open('about:blank')) { console.log('window opened'); } else { console.log('error while opening window'); } And I run :jseval if (window.open('about:blank')) { console.log('window opened'); } else { console.log('error while opening window'); }
Then the javascript message "error while opening window" should be logged Then the javascript message "error while opening window" should be logged