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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 84a69979c2a15e9a3b98c02c3f3147ab5818c5ce
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 20 19:20:26 2002 +0000

    	Fixed: 3061174 - javascript: URLs sent by plugins don't work
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2782 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index dfd3944..5f2159d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-20  Chris Blumenberg  <cblu at apple.com>
+	
+	Fixed: 3061174 - javascript: URLs sent by plugins don't work
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+
 2002-11-20  Darin Adler  <darin at apple.com>
 
         * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index dfd3944..5f2159d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-20  Chris Blumenberg  <cblu at apple.com>
+	
+	Fixed: 3061174 - javascript: URLs sent by plugins don't work
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+
 2002-11-20  Darin Adler  <darin at apple.com>
 
         * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index aa58b17..f6d62fd 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -792,18 +792,28 @@
             return NPERR_INVALID_URL;
         }
     } else {
-	WebFrame *frame = [[self webFrame] findOrCreateFramedNamed:target];
-	[frame loadRequest:request];
-
-	if (notifyData) {
-	    if (![target isEqualToString:@"_self"] && ![target isEqualToString:@"_current"] &&
-		![target isEqualToString:@"_parent"] && ![target isEqualToString:@"_top"]) {
-		
-		[streamNotifications setObject:[NSValue valueWithPointer:notifyData] forKey:URL];
-		[[NSNotificationCenter defaultCenter] addObserver:self
-		selector:@selector(frameStateChanged:) name:WebFrameStateChangedNotification object:frame];
-	    }
-	}
+        if([[URL scheme] isEqualToString:@"javascript"]){
+            NSString *JSString = [[URL absoluteString] substringFromIndex:11];
+            [[self controller] stringByEvaluatingJavaScriptFromString:JSString];
+            if(notifyData){
+               NPP_URLNotify(instance, [[URL absoluteString] cString], NPRES_DONE, notifyData);
+            }
+        }else{
+            WebFrame *frame = [[self webFrame] findOrCreateFramedNamed:target];
+            [frame loadRequest:request];
+    
+            if (notifyData) {
+                if (![target isEqualToString:@"_self"] && ![target isEqualToString:@"_current"] &&
+                    ![target isEqualToString:@"_parent"] && ![target isEqualToString:@"_top"]) {
+                    
+                    [streamNotifications setObject:[NSValue valueWithPointer:notifyData] forKey:URL];
+                    [[NSNotificationCenter defaultCenter] addObserver:self
+                                                             selector:@selector(frameStateChanged:)
+                                                                 name:WebFrameStateChangedNotification
+                                                               object:frame];
+                }
+            }
+        }
     }
     
     return NPERR_NO_ERROR;

-- 
WebKit Debian packaging