Enable JavaScript only when Info.plist specifies isJavaScriptEnabled #1003
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
trollixx
requested changes
Oct 7, 2018
src/libs/ui/widgets/webviewtab.cpp
Outdated
| @@ -70,6 +70,11 @@ void WebViewTab::setZoomLevel(int level) | |||
| m_webView->setZoomLevel(level); | |||
| } | |||
|
|
|||
| void WebViewTab::setJavaScriptEnabled(bool isJavaScriptEnabled) | |||
| { | |||
| this->m_webView->page()->settings()->setAttribute(QWebSettings::JavascriptEnabled, isJavaScriptEnabled); | |||
src/libs/registry/docset.cpp
Outdated
| @@ -163,6 +163,10 @@ Docset::Docset(const QString &path) : | |||
| } | |||
| } | |||
|
|
|||
| // Set if javascript enabled | |||
| if (plist.contains(InfoPlist::IsJavaScriptEnabled)) | |||
There was a problem hiding this comment.
Please add curly brackets, I know they are still missing in many places, but I am trying to add them everywhere now.
src/libs/registry/docset.cpp
Outdated
| @@ -163,6 +163,10 @@ Docset::Docset(const QString &path) : | |||
| } | |||
| } | |||
|
|
|||
| // Set if javascript enabled | |||
There was a problem hiding this comment.
No need in this comment, the block of code is pretty much self-explanatory.
src/libs/ui/widgets/webviewtab.h
Outdated
| @@ -52,6 +52,7 @@ class WebViewTab : public QWidget | |||
|
|
|||
| int zoomLevel() const; | |||
| void setZoomLevel(int level); | |||
| void setJavaScriptEnabled(bool isJavaScriptEnabled); | |||
src/libs/ui/widgets/webviewtab.cpp
Outdated
| @@ -70,6 +70,11 @@ void WebViewTab::setZoomLevel(int level) | |||
| m_webView->setZoomLevel(level); | |||
| } | |||
|
|
|||
| void WebViewTab::setJavaScriptEnabled(bool isJavaScriptEnabled) | |||
There was a problem hiding this comment.
bool enabled to follow the convention around the code.
trollixx
approved these changes
Oct 7, 2018
|
Merged, thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up to #999
Implement
isJavaScriptEnabledthroughInfo.plist