[Laszlo-checkins] r14090 - in openlaszlo/branches/4.4: . lps/includes/source

[ptw@openlaszlo.org]

Author: ptw
Date: 2009-06-09 04:09:02 -0700 (Tue, 09 Jun 2009)
New Revision: 14090

Modified:
   openlaszlo/branches/4.4/
   openlaszlo/branches/4.4/lps/includes/source/iframemanager.js
Log:
Merged revisions 14087 via svnmerge from 
http://svn.openlaszlo.org/openlaszlo/trunk

.......
  r14087 | max | 2009-06-09 02:13:20 -0400 (Tue, 09 Jun 2009) | 16 lines
  
  Change 20090608-maxcarlson-8 by maxcarlson at Bank on 2009-06-08 17:48:59 PDT
      in /Users/maxcarlson/openlaszlo/trunk-clean
      for http://svn.openlaszlo.org/openlaszlo/trunk
  
  Summary: Fix context menus for iframes in IE DHTML
  
  Bugs Fixed: LPP-8255 - IE DHTML: right-clicking an iframe causes a runtime exception
  
  Technical Reviewer: hminsky
  QA Reviewer: lorien
  
  Details: Ensure the correct IE-specific event object is passed into the mouse handler.
  
  Tests: See LPP-8255
.......



Property changes on: openlaszlo/branches/4.4
___________________________________________________________________
Name: svnmerge-integrated
   - /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/4.2:1-12154,12181,13205,13778 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554,13476,13629 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-13937,13948-13952,13954-13968,13970,13972-13980,13982-13985,13987-14002,14021-14032,14034,14036-14067
   + /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/4.2:1-12154,12181,13205,13778 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554,13476,13629 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-13937,13948-13952,13954-13968,13970,13972-13980,13982-13985,13987-14002,14021-14032,14034,14036-14067,14087

Modified: openlaszlo/branches/4.4/lps/includes/source/iframemanager.js
===================================================================
--- openlaszlo/branches/4.4/lps/includes/source/iframemanager.js	2009-06-09 10:30:05 UTC (rev 14089)
+++ openlaszlo/branches/4.4/lps/includes/source/iframemanager.js	2009-06-09 11:09:02 UTC (rev 14090)
@@ -386,6 +386,7 @@
                 lz.embed.attachEventHandler(iframe.document, 'click', lz.embed.iframemanager, '__mouseEvent', id);
                 //lz.embed.attachEventHandler(iframe.document, 'mousemove', lz.embed.iframemanager, '__mouseEvent', id);
                 iframe.document.oncontextmenu = function(e) {
+                    if (! e) e = iframe.event;
                     return lz.embed.iframemanager.__mouseEvent(e, id);
                 }
                 if (lz.embed.browser.isIE) {