From kde-commits Mon Mar 17 21:02:19 2008 From: David Faure Date: Mon, 17 Mar 2008 21:02:19 +0000 To: kde-commits Subject: branches/KDE/4.0/kdelibs/khtml/ecma Message-Id: <1205787739.301723.14219.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=120578774925741 SVN commit 786746 by dfaure: revert -- this was meant for trunk. Better make such changes in 4.1 in case websites with konq-specific code want to adjust based on the konq version. M +7 -7 kjs_events.cpp --- branches/KDE/4.0/kdelibs/khtml/ecma/kjs_events.cpp #786745:786746 @@ -644,14 +644,14 @@ return jsBoolean(event.metaKey()); case Button: { - if ( exec->dynamicInterpreter()->compatMode() == Interpreter::IECompat ) { - // Tricky. The DOM (and khtml) use 0 for LMB, 1 for MMB and 2 for RMB - // but MSIE uses 1=LMB, 2=RMB, 4=MMB, as a bitfield - int domButton = event.button(); - int button = domButton==0 ? 1 : domButton==1 ? 4 : domButton==2 ? 2 : 0; - return jsNumber( (unsigned int)button ); + if ( exec->dynamicInterpreter()->compatMode() == Interpreter::NetscapeCompat ) { + return jsNumber(event.button()); } - return jsNumber(event.button()); + // Tricky. The DOM (and khtml) use 0 for LMB, 1 for MMB and 2 for RMB + // but MSIE uses 1=LMB, 2=RMB, 4=MMB, as a bitfield + int domButton = event.button(); + int button = domButton==0 ? 1 : domButton==1 ? 4 : domButton==2 ? 2 : 0; + return jsNumber( (unsigned int)button ); } case ToElement: // MSIE extension - "the object toward which the user is moving the mouse pointer"