From 36724df3a69d815793c67a8b431470209427c3db Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Mon, 20 Jan 2014 12:46:39 +0100
Subject: [PATCH] [QupZillaPages] Always enable JavaScript for qupzilla: pages

Closes #1150
---
 src/lib/webview/webpage.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/lib/webview/webpage.cpp b/src/lib/webview/webpage.cpp
index 9fe243138..8ab1ebb2c 100644
--- a/src/lib/webview/webpage.cpp
+++ b/src/lib/webview/webpage.cpp
@@ -204,7 +204,10 @@ bool WebPage::isLoading() const
 
 void WebPage::urlChanged(const QUrl &url)
 {
-    Q_UNUSED(url)
+    // Make sure JavaScript is enabled for qupzilla pages regardless of user settings
+    if (url.scheme() == QLatin1String("qupzilla")) {
+        settings()->setAttribute(QWebSettings::JavascriptEnabled, true);
+    }
 
     if (isLoading()) {
         m_adBlockedEntries.clear();
@@ -280,6 +283,12 @@ void WebPage::printFrame(QWebFrame* frame)
 
 void WebPage::addJavaScriptObject()
 {
+    // Make sure all other sites have JavaScript set by user preferences
+    // (JavaScript is enabled in WebPage::urlChanged)
+    if (url().scheme() != QLatin1String("qupzilla")) {
+        settings()->setAttribute(QWebSettings::JavascriptEnabled, mApp->webSettings()->testAttribute(QWebSettings::JavascriptEnabled));
+    }
+
     if (url().toString() != QLatin1String("qupzilla:speeddial")) {
         return;
     }