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

Rename javascript-can-open-windows setting

Browse Source 
Fixes #1896.
This commit is contained in:
Florian Bruhin 2016-09-05 17:09:14 +02:00
parent d2a3541d6e
commit 308f38ab34
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.asciidoc
View File

@ -107,6 +107,8 @@ Changed
- Lots of improvements to and bugfixes for the QtWebEngine backend, such as - Lots of improvements to and bugfixes for the QtWebEngine backend, such as
working hints. However, using qutebrowser directly from git is still advised working hints. However, using qutebrowser directly from git is still advised
when using `--backend webengine`. when using `--backend webengine`.
- `content -> javascript-can-open-windows` got renamed to
`javascript-can-open-windows-automatically`.
Deprecated Deprecated
~~~~~~~~~~ ~~~~~~~~~~

8
doc/help/settings.asciidoc
View File

@ -157,7 +157,7 @@
|<<content-hyperlink-auditing,hyperlink-auditing>>|Enable or disable hyperlink auditing (<a ping>). |<<content-hyperlink-auditing,hyperlink-auditing>>|Enable or disable hyperlink auditing (<a ping>).
|<<content-geolocation,geolocation>>|Allow websites to request geolocations. |<<content-geolocation,geolocation>>|Allow websites to request geolocations.
|<<content-notifications,notifications>>|Allow websites to show notifications. |<<content-notifications,notifications>>|Allow websites to show notifications.
|<<content-javascript-can-open-windows,javascript-can-open-windows>>|Whether JavaScript programs can open new windows. |<<content-javascript-can-open-windows-automatically,javascript-can-open-windows-automatically>>|Whether JavaScript programs can open new windows without user interaction.
|<<content-javascript-can-close-windows,javascript-can-close-windows>>|Whether JavaScript programs can close windows. |<<content-javascript-can-close-windows,javascript-can-close-windows>>|Whether JavaScript programs can close windows.
|<<content-javascript-can-access-clipboard,javascript-can-access-clipboard>>|Whether JavaScript programs can read or write to the clipboard. |<<content-javascript-can-access-clipboard,javascript-can-access-clipboard>>|Whether JavaScript programs can read or write to the clipboard.
|<<content-ignore-javascript-prompt,ignore-javascript-prompt>>|Whether all javascript prompts should be ignored. |<<content-ignore-javascript-prompt,ignore-javascript-prompt>>|Whether all javascript prompts should be ignored.
@ -1427,9 +1427,9 @@ Valid values:
Default: +pass:[ask]+ Default: +pass:[ask]+
[[content-javascript-can-open-windows]] [[content-javascript-can-open-windows-automatically]]
=== javascript-can-open-windows === javascript-can-open-windows-automatically
Whether JavaScript programs can open new windows. Whether JavaScript programs can open new windows without user interaction.
Valid values: Valid values:

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

@ -112,7 +112,7 @@ MAPPINGS = {
Attribute(QWebEngineSettings.AutoLoadImages), Attribute(QWebEngineSettings.AutoLoadImages),
'allow-javascript': 'allow-javascript':
Attribute(QWebEngineSettings.JavascriptEnabled), Attribute(QWebEngineSettings.JavascriptEnabled),
'javascript-can-open-windows': 'javascript-can-open-windows-automatically':
Attribute(QWebEngineSettings.JavascriptCanOpenWindows), Attribute(QWebEngineSettings.JavascriptCanOpenWindows),
'javascript-can-access-clipboard': 'javascript-can-access-clipboard':
Attribute(QWebEngineSettings.JavascriptCanAccessClipboard), Attribute(QWebEngineSettings.JavascriptCanAccessClipboard),

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

@ -118,7 +118,7 @@ MAPPINGS = {
Attribute(QWebSettings.AutoLoadImages), Attribute(QWebSettings.AutoLoadImages),
'allow-javascript': 'allow-javascript':
Attribute(QWebSettings.JavascriptEnabled), Attribute(QWebSettings.JavascriptEnabled),
'javascript-can-open-windows': 'javascript-can-open-windows-automatically':
Attribute(QWebSettings.JavascriptCanOpenWindows), Attribute(QWebSettings.JavascriptCanOpenWindows),
'javascript-can-close-windows': 'javascript-can-close-windows':
Attribute(QWebSettings.JavascriptCanCloseWindows), Attribute(QWebSettings.JavascriptCanCloseWindows),

2
qutebrowser/config/config.py
View File

@ -385,6 +385,8 @@ class ConfigManager(QObject):
('completion', 'history-length'): 'cmd-history-max-items', ('completion', 'history-length'): 'cmd-history-max-items',
('colors', 'downloads.fg'): 'downloads.fg.start', ('colors', 'downloads.fg'): 'downloads.fg.start',
('ui', 'show-keyhints'): 'keyhint-blacklist', ('ui', 'show-keyhints'): 'keyhint-blacklist',
('content', 'javascript-can-open-windows'):
'javascript-can-open-windows-automatically',
} }
DELETED_OPTIONS = [ DELETED_OPTIONS = [
('colors', 'tab.separator'), ('colors', 'tab.separator'),

5
qutebrowser/config/configdata.py
View File

@ -808,9 +808,10 @@ def data(readonly=False):
SettingValue(typ.BoolAsk(), 'ask'), SettingValue(typ.BoolAsk(), 'ask'),
"Allow websites to show notifications."), "Allow websites to show notifications."),
('javascript-can-open-windows', ('javascript-can-open-windows-automatically',
SettingValue(typ.Bool(), 'false'), SettingValue(typ.Bool(), 'false'),
"Whether JavaScript programs can open new windows."), "Whether JavaScript programs can open new windows without user "
"interaction."),
('javascript-can-close-windows', ('javascript-can-close-windows',
SettingValue(typ.Bool(), 'false', SettingValue(typ.Bool(), 'false',