[Laszlo-checkins] r10233 - in openlaszlo/trunk: WEB-INF/lps/server/bin lps/components/extensions

[max@openlaszlo.org]

Author: max
Date: 2008-07-07 14:09:02 -0700 (Mon, 07 Jul 2008)
New Revision: 10233

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/bin/convert_laszlo.pl
   openlaszlo/trunk/lps/components/extensions/html.lzx
Log:
Change 20080707-maxcarlson-g by maxcarlson at Roboto on 2008-07-07 13:49:53 PDT
    in /Users/maxcarlson/openlaszlo/trunk-clean
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Fix lz.embed.setCanvasAttribute() with html tag

Bugs Fixed: LPP-6618 - HTML tag overwrites lz.embed namespace

Technical Reviewer: promanik
QA Reviewer: hminsky

Details: convert_laszlo.pl - Add conversion from Lz.setCanvasAttribute()/callMethod() -> lz.embed.* 

html.lzx - Don't overwrite lz.embed namespace (declared in services/LzBrowser.lzs)

Tests: IWFM



Modified: openlaszlo/trunk/WEB-INF/lps/server/bin/convert_laszlo.pl
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/bin/convert_laszlo.pl	2008-07-07 21:02:47 UTC (rev 10232)
+++ openlaszlo/trunk/WEB-INF/lps/server/bin/convert_laszlo.pl	2008-07-07 21:09:02 UTC (rev 10233)
@@ -57,6 +57,7 @@
                 widthheight   - getWidth(),getHeight() to width,height
                 tagname       - constructor.classname to constructor.tagname
                 states        - apply=" -> applied=", state.apply()/remove() -> setAttribute('applied', true|false)
+                proxymethods  - Lz.setCanvasAttribute()/callMethod() -> lz.embed.* 
 
    -v
            show version number and exit
@@ -86,6 +87,7 @@
 $xform{widthheight}=1;  # transform getWidth(),getHeight() to width,height
 $xform{tagname}=1;      # transform constructor.classname to constructor.tagname
 $xform{states}=1;       # transform apply=" -> applied=", state.apply()/remove() -> setAttribute('applied', true|false)
+$xform{proxymethods}=1; # transform Lz.setCanvasAttribute()/callMethod() -> lz.embed.* 
 
 ##
 # Other global variables
@@ -325,7 +327,14 @@
         s/\.remove\(\w*?\)/.setAttribute('applied', false)/g;
     }
 
+    #### transform proxymethods
+    #
+    # Lz.setCanvasAttribute()/callMethod() -> lz.embed.* 
 
+    if ($xform{proxymethods}) {
+        s/Lz.(setCanvasAttribute|callMethod)/lz.embed.$1/g;
+    }
+
     debugln(3, "   EMIT CONTENT: " . $_);
     print $FH $_;
     $_ = $save;

Modified: openlaszlo/trunk/lps/components/extensions/html.lzx
===================================================================
--- openlaszlo/trunk/lps/components/extensions/html.lzx	2008-07-07 21:02:47 UTC (rev 10232)
+++ openlaszlo/trunk/lps/components/extensions/html.lzx	2008-07-07 21:09:02 UTC (rev 10233)
@@ -11,7 +11,6 @@
     <otherwise>
 <script>
 // proxy object for browser lz.embed.iframemanager
-lz.embed  = {}
 lz.embed.iframemanager = {
     owners: {}
     ,create: function(owner, name, scrollbars) {