Merge commit 'refs/merge-requests/2263' of git://gitorious.org/rekonq/mainline into m2263

1 files changed, 12 insertions, 2 deletions

diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index d710c24c..63bc640d 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -93,8 +93,18 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
     if (_url.protocol() == QL1S("javascript"))
     {
         QString scriptSource = _url.authority();
-        if(scriptSource.isEmpty())
-            return false;
+        if(scriptSource.isEmpty()) {
+            // if javascript:<code here> then authority() returns
+            // an empty string. Extract the source manually
+// Use the prettyUrl() since that is unencoded
+
+            // 11 is length of 'javascript:'
+            // fromPercentEncoding() is used to decode all the % encoded
+            // characters to normal, so that it is treated as valid javascript
+            scriptSource = QUrl::fromPercentEncoding(_url.url().mid(11).toAscii());
+            if(scriptSource.isEmpty())
+                return false;
+        }
         
         QVariant result = frame->evaluateJavaScript(scriptSource);
         return true;