From c0bc8cfe4a9b8240b2261109c8f1e0124efac05d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 6 Sep 2010 01:39:56 +0200
Subject: Revert "This hacks should fix (a lot of) javascript handling."

Really sorry. Proposed fix does not handle cookies

This reverts commit b08c67eb1e45cb94dc6250fe555d84f0c0e7debe.

CCBUG:250298
---
 src/analyzer/networkanalyzer.cpp |  3 +--
 src/networkaccessmanager.cpp     | 18 +++++-------------
 src/protocolhandler.cpp          |  1 -
 3 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/analyzer/networkanalyzer.cpp b/src/analyzer/networkanalyzer.cpp
index d0044f47..c5b08835 100644
--- a/src/analyzer/networkanalyzer.cpp
+++ b/src/analyzer/networkanalyzer.cpp
@@ -162,8 +162,7 @@ void NetworkAnalyzer::requestFinished( QObject *replyObject )
     QString contentType = reply->header( QNetworkRequest::ContentTypeHeader ).toString();
     item->setText( 4, contentType );
 
-    if ( status == 302 ) 
-    {
+    if ( status == 302 ) {
         QUrl target = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
         item->setText( 5, i18n("Redirect: %1", target.toString() ) );
     }
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 60fecace..9d9101b9 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -86,18 +86,10 @@ QNetworkReply *NetworkAccessManager::createRequest(QNetworkAccessManager::Operat
     }
 
     // WARNING
-    // There are actually 3 exceptions here handled with QNAM
+    // There are actually 2 exceptions here handled with QNAM
     // instead of KIO that need fixes upstream before removing. They are:
-    // 1) AJAX requests handling
-    // 2) DeleteOperation
-    // 3) CustomOperation
-
-    // this is used to handle "AJAX" requests
-    QByteArray header = req.rawHeader("x-requested-with");
-    if(!header.isNull())
-    {
-        return QNetworkAccessManager::createRequest(op, req, outgoingData);
-    }
+    // 1) DeleteOperation
+    // 2) CustomOperation
 
     switch(op)
     {
@@ -118,14 +110,14 @@ QNetworkReply *NetworkAccessManager::createRequest(QNetworkAccessManager::Operat
         kDebug() << "DELETE OPERATION...";
         reply = QNetworkAccessManager::createRequest(op, req, outgoingData);
         if(!reply)
-            kDebug() << "oh oh... DELETE REPLY NULL";
+            kDebug() << "OOOOOOOOOOOOOOOOOOO DELETE REPLY NULL";
         break;
 
     case QNetworkAccessManager::CustomOperation:
         kDebug() << "CUSTOM OPERATION...";
         reply = QNetworkAccessManager::createRequest(op, req, outgoingData);
         if(!reply)
-            kDebug() << "oh oh... CUSTOM REPLY NULL";
+            kDebug() << "OOOOOOOOOOOOOOOOOOO CUSTOM REPLY NULL";
         break;
 
     default:
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index c0b8a6c2..be236843 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -85,7 +85,6 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
     // javascript handling
     if (_url.protocol() == QL1S("javascript"))
     {
-        kDebug() << "JAVASCRIPT URL: " << _url;
         QString scriptSource = _url.authority();
         if(scriptSource.isEmpty()) {
             // if javascript:<code here> then authority() returns
-- 
cgit v1.2.1