feat(registry,ui): respect per docset JavaScript enablement (fixes #999…

…) (#1003)

src/libs/registry/docset.cpp

@@ -57,7 +57,7 @@ const char DashDocSetPluginKeyword[] = "DashDocSetPluginKeyword";
 const char DashIndexFilePath[] = "dashIndexFilePath";
 const char DocSetPlatformFamily[] = "DocSetPlatformFamily";
 //const char IsDashDocset[] = "isDashDocset";
-//const char IsJavaScriptEnabled[] = "isJavaScriptEnabled";
+const char IsJavaScriptEnabled[] = "isJavaScriptEnabled";
 }
 }
 
@@ -163,6 +163,10 @@ Docset::Docset(const QString &path) :
         }
     }
 
+    if (plist.contains(InfoPlist::IsJavaScriptEnabled)) {
+        m_javaScriptEnabled = plist[InfoPlist::IsJavaScriptEnabled].toBool();
+    }
+
     m_keywords.removeDuplicates();
 
     // Prefer index path provided by the docset over metadata.
@@ -682,6 +686,11 @@ void Docset::setFuzzySearchEnabled(bool enabled)
     m_fuzzySearchEnabled = enabled;
 }
 
+bool Docset::isJavaScriptEnabled() const
+{
+    return m_javaScriptEnabled;
+}
+
 /**
  * \brief Returns score based on a substring position in a string.
  * \param str Original string.

src/libs/registry/docset.h

@@ -79,6 +79,8 @@ class Docset
     bool isFuzzySearchEnabled() const;
     void setFuzzySearchEnabled(bool enabled);
 
+    bool isJavaScriptEnabled() const;
+
 private:
     enum class Type {
         Invalid,
@@ -113,6 +115,7 @@ class Docset
     mutable QMap<QString, QMap<QString, QUrl>> m_symbols;
     Util::SQLiteDatabase *m_db = nullptr;
     bool m_fuzzySearchEnabled = false;
+    bool m_javaScriptEnabled = false;
 };
 
 } // namespace Registry

src/libs/ui/mainwindow.cpp

@@ -624,9 +624,10 @@ void MainWindow::attachTab(TabState *tabState)
         m_tabBar->setTabIcon(m_tabBar->currentIndex(), docsetIcon(name));
 
         Registry::Docset *docset = m_application->docsetRegistry()->docset(name);
-        if (docset)
+        if (docset) {
             tabState->tocModel->setResults(docset->relatedLinks(url));
-
+            tabState->widget->setJavaScriptEnabled(docset->isJavaScriptEnabled());
+        }
         ui->actionBack->setEnabled(tabState->widget->canGoBack());
         ui->actionForward->setEnabled(tabState->widget->canGoForward());
     });

src/libs/ui/widgets/webviewtab.cpp

@@ -70,6 +70,11 @@ void WebViewTab::setZoomLevel(int level)
     m_webView->setZoomLevel(level);
 }
 
+void WebViewTab::setJavaScriptEnabled(bool enabled)
+{
+    m_webView->page()->settings()->setAttribute(QWebSettings::JavascriptEnabled, enabled);
+}
+
 void WebViewTab::setWebBridgeObject(const QString &name, QObject *object)
 {
     connect(m_webView->page()->mainFrame(), &QWebFrame::javaScriptWindowObjectCleared,

src/libs/ui/widgets/webviewtab.h

@@ -52,6 +52,7 @@ class WebViewTab : public QWidget
 
     int zoomLevel() const;
     void setZoomLevel(int level);
+    void setJavaScriptEnabled(bool enabled);
 
     void setWebBridgeObject(const QString &name, QObject *object);