[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 5e9ad4522e7da63183cc1f7a7d3145d24d8fd250
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 15 09:04:04 2002 +0000

            Reviewed by Darin.
    
    	- slightly improved situation with 3124933 (abcnews.com leads to
    	empty window with sheet complaining about javascript: URL); the
    	popup window still comes up empty but it doesn't put up a sheet.
    
            * kwq/KWQKHTMLPartBrowserExtension.mm:
            (KHTMLPartBrowserExtension::openURLRequest): Handled "javascript:"
    	URLs here.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3057 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 879644d..a47d130 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-12-14  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- slightly improved situation with 3124933 (abcnews.com leads to
+	empty window with sheet complaining about javascript: URL); the
+	popup window still comes up empty but it doesn't put up a sheet.
+	
+        * kwq/KWQKHTMLPartBrowserExtension.mm:
+        (KHTMLPartBrowserExtension::openURLRequest): Handled "javascript:"
+	URLs here.
+
 2002-12-14  David Hyatt  <hyatt at apple.com>
 
 	Fix insidemacgames.com.  Reinstate rules I removed
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 879644d..a47d130 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-12-14  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- slightly improved situation with 3124933 (abcnews.com leads to
+	empty window with sheet complaining about javascript: URL); the
+	popup window still comes up empty but it doesn't put up a sheet.
+	
+        * kwq/KWQKHTMLPartBrowserExtension.mm:
+        (KHTMLPartBrowserExtension::openURLRequest): Handled "javascript:"
+	URLs here.
+
 2002-12-14  David Hyatt  <hyatt at apple.com>
 
 	Fix insidemacgames.com.  Reinstate rules I removed
diff --git a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
index b86fed0..adafa15 100644
--- a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
+++ b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
@@ -35,7 +35,13 @@ KHTMLPartBrowserExtension::KHTMLPartBrowserExtension(KHTMLPart *part)
 void KHTMLPartBrowserExtension::openURLRequest(const KURL &url, 
 					       const KParts::URLArgs &args)
 {
-    KWQ(m_part)->openURLRequest(url, args);
+    if (url.protocol().lower() == "javascript") {
+	QString string = url.url();
+	KWQ(m_part)->createDummyDocument();
+	KWQ(m_part)->executeScript(string.mid(strlen("javascript:")));
+     } else {
+	KWQ(m_part)->openURLRequest(url, args);
+    }
 }
 
 void KHTMLPartBrowserExtension::openURLNotify()

-- 
WebKit Debian packaging