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

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:21:28 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit d32e00592379717ed416eb0cfb371faccbc4b9b3
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 23 21:13:11 2003 +0000

            Reviewed by Trey.
    
    	- fixed 3151442 - mac.com homepage editing - selection and clicking with mouse don't work
    
            * khtml/ecma/kjs_events.cpp:
            (JSEventListener::handleEvent): Only allow a false return value to
    	prevent default if this is an html event handler, rather than one
    	set with addEventListener or the like.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a1fc9d9..156ffea 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-01-23  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Trey.
+
+	- fixed 3151442 - mac.com homepage editing - selection and clicking with mouse don't work
+	
+        * khtml/ecma/kjs_events.cpp:
+        (JSEventListener::handleEvent): Only allow a false return value to
+	prevent default if this is an html event handler, rather than one
+	set with addEventListener or the like.
+
 2003-01-23  Chris Blumenberg  <cblu at apple.com>
 
 	Replaced the paint phase constants with the PaintAction enum. Added PaintActionSelection as a paint action. This will eventually allow us to only paint selected objects. This is needed for the text dragging image.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a1fc9d9..156ffea 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-01-23  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Trey.
+
+	- fixed 3151442 - mac.com homepage editing - selection and clicking with mouse don't work
+	
+        * khtml/ecma/kjs_events.cpp:
+        (JSEventListener::handleEvent): Only allow a false return value to
+	prevent default if this is an html event handler, rather than one
+	set with addEventListener or the like.
+
 2003-01-23  Chris Blumenberg  <cblu at apple.com>
 
 	Replaced the paint phase constants with the PaintAction enum. Added PaintActionSelection as a paint action. This will eventually allow us to only paint selected objects. This is needed for the text dragging image.
diff --git a/WebCore/khtml/ecma/kjs_events.cpp b/WebCore/khtml/ecma/kjs_events.cpp
index 3885c4c..accd9e2 100644
--- a/WebCore/khtml/ecma/kjs_events.cpp
+++ b/WebCore/khtml/ecma/kjs_events.cpp
@@ -95,7 +95,7 @@ void JSEventListener::handleEvent(DOM::Event &evt)
     interpreter->setCurrentEvent( 0 );
     if ( exec->hadException() )
         exec->clearException();
-    else
+    else if (html)
     {
         QVariant ret = ValueToVariant(exec, retval);
         if (ret.type() == QVariant::Bool && ret.toBool() == false)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list