[Laszlo-checkins] r8183 - in openlaszlo/branches/pagan-deities: . WEB-INF/lps/lfc/kernel/swf

[max@openlaszlo.org]

Author: max
Date: 2008-03-05 14:23:35 -0800 (Wed, 05 Mar 2008)
New Revision: 8183

Modified:
   openlaszlo/branches/pagan-deities/
   openlaszlo/branches/pagan-deities/WEB-INF/lps/lfc/kernel/swf/LzSprite.as
Log:
Merged revisions 8182 via svnmerge from 
http://svn.openlaszlo.org/openlaszlo/trunk

.......
  r8182 | max | 2008-03-05 14:13:01 -0800 (Wed, 05 Mar 2008) | 24 lines
  
  Change 20080305-maxcarlson-w by maxcarlson at Roboto on 2008-03-05 13:48:58 PST
      in /Users/maxcarlson/openlaszlo/trunk
      for http://svn.openlaszlo.org/openlaszlo/trunk
  
  Summary: Fix contextmenu for canvas, text and inputtext
  
  New Features:
  
  Bugs Fixed: LPP-5533
  
  Technical Reviewer: promanik
  QA Reviewer: a.bargull at intensis.de
  Doc Reviewer: (pending)
  
  Documentation:
  
  Release Notes:
  
  Details: Attach to getMCRef() for canvas and LzTextSprite instances.  If this is the canvas, attache to _root.menu.  Move testing inside if ($debug) case.
      
  
  Tests: See LPP-5533 and LPP-4212
.......



Property changes on: openlaszlo/branches/pagan-deities
___________________________________________________________________
Name: svnmerge-integrated
   - /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-7950,7983,8021,8062,8144-8146,8176
   + /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-7950,7983,8021,8062,8144-8146,8176,8182

Modified: openlaszlo/branches/pagan-deities/WEB-INF/lps/lfc/kernel/swf/LzSprite.as
===================================================================
--- openlaszlo/branches/pagan-deities/WEB-INF/lps/lfc/kernel/swf/LzSprite.as	2008-03-05 22:13:01 UTC (rev 8182)
+++ openlaszlo/branches/pagan-deities/WEB-INF/lps/lfc/kernel/swf/LzSprite.as	2008-03-05 22:23:35 UTC (rev 8183)
@@ -1628,9 +1628,13 @@
     }
 
     // [todo hqm 01-24-07] SWF-specific 
-    if (this.owner == canvas) {
-        // if this is the canvas sprite
+    if (this.owner == canvas || this instanceof LzTextSprite) {
+        // check canvas for LPP-4214, instanceof LzTextSprite for LPP-5533
         var mc = this.getMCRef();
+        if (this.owner == canvas) {
+            // must use _root if canvas
+            var mc = _root;
+        } 
         if (mc != null) {
             mc.menu = cmenu;
         }
@@ -1645,8 +1649,10 @@
         mb.menu = cmenu;
     }
 
-    if (mb == null && mc == null) {
-      if ($debug) Debug.warn("LzView.setContextMenu: cannot set menu on view %w, it has no foreground or background movieclip", this.owner);
+    if ($debug) {
+        if (mb == null && mc == null) {
+        Debug.warn("LzView.setContextMenu: cannot set menu on view %w, it has no foreground or background movieclip", this.owner);
+        }
     }
 }