[Laszlo-checkins] r10102 - in openlaszlo/trunk: docs/src/xsl lps/includes/source

[max@openlaszlo.org]

Author: max
Date: 2008-06-27 18:11:57 -0700 (Fri, 27 Jun 2008)
New Revision: 10102

Modified:
   openlaszlo/trunk/docs/src/xsl/common-html.xsl
   openlaszlo/trunk/lps/includes/source/embednew.js
Log:
Change 20080627-maxcarlson-n by maxcarlson at Roboto on 2008-06-27 17:42:55 PDT
    in /Users/maxcarlson/openlaszlo/trunk-clean
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Fix mouse wheel scrolling for reference pages.

Bugs Fixed: LPP-6549 - in a reference window with the nav pane scroll wheel won't scroll the HTML page.

Technical Reviewer: promanik
QA Reviewer: ptw

Details: common-html.xsl - Pass cancelmousewheel: true to prevent embedded examples from grabbing the mouse wheel.

embednew.js - Add cancelmousewheel property which prevents registration for mousewheel events if true.

Tests: Build the reference docs, try using the mouse wheel.



Modified: openlaszlo/trunk/docs/src/xsl/common-html.xsl
===================================================================
--- openlaszlo/trunk/docs/src/xsl/common-html.xsl	2008-06-28 01:11:19 UTC (rev 10101)
+++ openlaszlo/trunk/docs/src/xsl/common-html.xsl	2008-06-28 01:11:57 UTC (rev 10102)
@@ -245,7 +245,7 @@
           <xsl:if test="$query-parameters">&amp;<xsl:value-of select="$query-parameters[1]/text()"></xsl:value-of></xsl:if>
         </xsl:variable>
         <xsl:variable name="canvas-id" select="generate-id(.)"/>
-        <xsl:variable name="swf-embed-params">{url: '<xsl:value-of select="concat($fname, '?lzt=swf', $query-param)"/>', id: '<xsl:value-of select="concat($canvas-id,'SWF')"/>', history: false <xsl:value-of select="$canvas-parameters"/>}</xsl:variable>
+        <xsl:variable name="swf-embed-params">{url: '<xsl:value-of select="concat($fname, '?lzt=swf', $query-param)"/>', id: '<xsl:value-of select="concat($canvas-id,'SWF')"/>', history: false, cancelmousewheel: true <xsl:value-of select="$canvas-parameters"/>}</xsl:variable>
         <xsl:variable name="dhtml-embed-params">{url: '<xsl:value-of select="concat($fname, '?lzt=html&amp;lzr=dhtml', $query-param)"/>', id: '<xsl:value-of select="concat($canvas-id,'DHTML')"/>', cancelkeyboardcontrol: true, <xsl:value-of select="$canvas-parameters"/>}</xsl:variable>
         <!-- To test examples in DHTML, uncomment the second script block below
              and the call to lz.embed.lfc() above.

Modified: openlaszlo/trunk/lps/includes/source/embednew.js
===================================================================
--- openlaszlo/trunk/lps/includes/source/embednew.js	2008-06-28 01:11:19 UTC (rev 10101)
+++ openlaszlo/trunk/lps/includes/source/embednew.js	2008-06-28 01:11:57 UTC (rev 10102)
@@ -138,9 +138,10 @@
         // for callbacks onload
         lz.embed.dojo.addLoadedListener(lz.embed._loaded, app);
         lz.embed.dojo.setSwf(swfargs, minimumVersion);
-        if (lz.embed.browser.OS == 'Mac' || 
+        if (properties.cancelmousewheel != true && 
+            (lz.embed.browser.OS == 'Mac' || 
             // fix for LPP-5393
-            ((swfargs.wmode == 'transparent' || swfargs.wmode == 'opaque') && lz.embed.browser.OS == 'Windows' && (lz.embed.browser.isOpera || lz.embed.browser.isFirefox))) {
+            ((swfargs.wmode == 'transparent' || swfargs.wmode == 'opaque') && lz.embed.browser.OS == 'Windows' && (lz.embed.browser.isOpera || lz.embed.browser.isFirefox)))) {
             if (lz.embed['mousewheel']) {
                 lz.embed.mousewheel.setCallback(app, '_sendMouseWheel');
             }