Author: max Date: 2008-03-12 17:26:19 -0700 (Wed, 12 Mar 2008) New Revision: 8240
Modified: openlaszlo/branches/devildog/ openlaszlo/branches/devildog/lps/components/base/basedatacombobox.lzx openlaszlo/branches/devildog/lps/includes/source/embednew.js Log: Merged revisions 8186-8188,8190-8200,8203-8208,8211,8213-8214,8216-8219,8223-8230,8233-8235,8237-8239 via svnmerge from http://svn.openlaszlo.org/openlaszlo/trunk ....... r8186 | max | 2008-03-05 16:39:43 -0800 (Wed, 05 Mar 2008) | 24 lines Change 20080305-maxcarlson-0 by [EMAIL PROTECTED] on 2008-03-05 15:17:23 PST in /Users/maxcarlson/openlaszlo/trunk for http://svn.openlaszlo.org/openlaszlo/trunk Summary: Fix swf mousewheel support on windows opera and firefox when wmode is transparent New Features: Bugs Fixed: LPP-5393 - SWF doesn't get mousewheel events in Firefox when wmode is transparent Technical Reviewer: promanik QA Reviewer: [EMAIL PROTECTED] Doc Reviewer: (pending) Documentation: Release Notes: Details: Opera on OS X doesn't support the mousewheel in SWF. This change adds mousewheel events to Windows firefox and opera when wmode is transparent. Tests: See LPP-5393 ....... r8237 | max | 2008-03-12 13:47:45 -0700 (Wed, 12 Mar 2008) | 24 lines Change 20080312-maxcarlson-i by [EMAIL PROTECTED] on 2008-03-12 12:34:14 PDT in /Users/maxcarlson/openlaszlo/trunk for http://svn.openlaszlo.org/openlaszlo/trunk Summary: UPDATED Fix swf mousewheel support on windows opera and firefox when wmode is transparent or opaque New Features: Bugs Fixed: LPP-5393 - SWF doesn't get mousewheel events in Firefox when wmode is transparent Technical Reviewer: promanik QA Reviewer: [EMAIL PROTECTED] Doc Reviewer: (pending) Documentation: Release Notes: Details: Opera on OS X doesn't support the mousewheel in SWF. This change adds mousewheel events to Windows firefox and opera when wmode is transparent. Tests: See LPP-5393 testcase, try both wmode 'opaque' and wmode 'transparent' ....... r8239 | max | 2008-03-12 17:18:34 -0700 (Wed, 12 Mar 2008) | 24 lines Change 20080312-maxcarlson-D by [EMAIL PROTECTED] on 2008-03-12 14:57:41 PDT in /Users/maxcarlson/openlaszlo/trunk for http://svn.openlaszlo.org/openlaszlo/trunk Summary: Fix bogus calls to basedatacombobox._updateSelectionByIndex() New Features: Bugs Fixed: LPP-5549 - basedatacombobox.onselect event fires even if selectfirst attribute is set to false Technical Reviewer: promanik QA Reviewer: [EMAIL PROTECTED] Doc Reviewer: (pending) Documentation: Release Notes: Details: Make sure the index is valid in _updateSelectionByIndex(); Tests: See LPP-5549 ....... Property changes on: openlaszlo/branches/devildog ___________________________________________________________________ Name: svnmerge-integrated - /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497 /openlaszlo/trunk:1-8173 + /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497 /openlaszlo/trunk:1-8173,8186-8188,8190-8200,8203-8208,8211,8213-8214,8216-8219,8223-8230,8233-8235,8237-8239 Modified: openlaszlo/branches/devildog/lps/components/base/basedatacombobox.lzx =================================================================== --- openlaszlo/branches/devildog/lps/components/base/basedatacombobox.lzx 2008-03-13 00:18:34 UTC (rev 8239) +++ openlaszlo/branches/devildog/lps/components/base/basedatacombobox.lzx 2008-03-13 00:26:19 UTC (rev 8240) @@ -1,5 +1,5 @@ <!-- * X_LZ_COPYRIGHT_BEGIN *************************************************** -* Copyright 2005-2007 Laszlo Systems, Inc. All Rights Reserved. * +* Copyright 2005-2008 Laszlo Systems, Inc. All Rights Reserved. * * Use is subject to license terms. * * X_LZ_COPYRIGHT_END ****************************************************** --> <!-- @LZX_VERSION@ --> @@ -236,6 +236,7 @@ @keywords private --> <method name="_updateSelectionByIndex" args="index,dontSetValue,isinitvalue"> <![CDATA[ + if (index < 0) return; var dp = new LzDatapointer(this); var nodes = dp.xpathQuery(this.itemdatapath); Modified: openlaszlo/branches/devildog/lps/includes/source/embednew.js =================================================================== --- openlaszlo/branches/devildog/lps/includes/source/embednew.js 2008-03-13 00:18:34 UTC (rev 8239) +++ openlaszlo/branches/devildog/lps/includes/source/embednew.js 2008-03-13 00:26:19 UTC (rev 8240) @@ -133,7 +133,9 @@ dojo.flash.setSwf(swfargs, minimumVersion); Lz.__BrowserDetect.init(); - if (Lz.__BrowserDetect.OS == 'Mac') { + if (Lz.__BrowserDetect.OS == 'Mac' || + // fix for LPP-5393 + ((swfargs.wmode == 'transparent' || swfargs.wmode == 'opaque') && Lz.__BrowserDetect.OS == 'Windows' && (Lz.__BrowserDetect.isOpera || Lz.__BrowserDetect.isFirefox))) { LzMousewheelKernel.setCallback(app, '_sendMouseWheel'); } } _______________________________________________ Laszlo-checkins mailing list [email protected] http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
