[Laszlo-checkins] r14284 - in openlaszlo/branches/4.4: . WEB-INF/lps/lfc/kernel/dhtml

[ptw@openlaszlo.org]

Author: ptw
Date: 2009-07-07 15:27:12 -0700 (Tue, 07 Jul 2009)
New Revision: 14284

Modified:
   openlaszlo/branches/4.4/
   openlaszlo/branches/4.4/WEB-INF/lps/lfc/kernel/dhtml/LzMouseKernel.js
Log:
Merged revisions 14283 via svnmerge from 
http://svn.openlaszlo.org/openlaszlo/trunk

.......
  r14283 | max | 2009-07-07 17:43:28 -0400 (Tue, 07 Jul 2009) | 16 lines
  
  Change 20090707-maxcarlson-9 by maxcarlson at Bank on 2009-07-07 12:35:49 PDT
      in /Users/maxcarlson/openlaszlo/trunk-clean
      for http://svn.openlaszlo.org/openlaszlo/trunk
  
  Summary: Cache/restore inputtext selection when disabling global clickability
  
  Bugs Fixed: LPP-8289 - Mousing over an iframe while cursor is in a text component makes the cursor disappear
  
  Technical Reviewer: ptw
  QA Reviewer: hminsky
  
  Details: Cache inputtext selection when global clickability is turned off, usually by an iframe/html component.  Restore the selection when clickability is turned back on.
  
  Tests: See testcase attached to lpp-8289.  Modify test.lzx to return instead of restoring the focus.  Notice that the correct selection/cursor position is restored when mousing into/out of the red box.
.......



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-13938,13940-13945,13947-13952,13954-13968,13970,13972-13980,13982-13985,13987-14015,14017-14032,14034,14036-14069,14071-14109,14116,14124,14127,14129,14146-14156,14159,14165,14167-14171,14173-14182,14184-14206,14210-14215,14217-14273
   + /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-13938,13940-13945,13947-13952,13954-13968,13970,13972-13980,13982-13985,13987-14015,14017-14032,14034,14036-14069,14071-14109,14116,14124,14127,14129,14146-14156,14159,14165,14167-14171,14173-14182,14184-14206,14210-14215,14217-14273,14283

Modified: openlaszlo/branches/4.4/WEB-INF/lps/lfc/kernel/dhtml/LzMouseKernel.js
===================================================================
--- openlaszlo/branches/4.4/WEB-INF/lps/lfc/kernel/dhtml/LzMouseKernel.js	2009-07-07 21:43:28 UTC (rev 14283)
+++ openlaszlo/branches/4.4/WEB-INF/lps/lfc/kernel/dhtml/LzMouseKernel.js	2009-07-07 22:27:12 UTC (rev 14284)
@@ -189,8 +189,15 @@
         if (this.__resetonmouseover) {
             this.__resetonmouseover = false;
             this.setGlobalClickable(true);
+            var cs = this.__cachedSelection;
+            if (cs) {
+                var sprite = cs.s;
+                sprite.setSelection(cs.st, cs.st + cs.sz);
+                cs = null;
+            }
         }
     }
+    ,__cachedSelection: null
     ,setGlobalClickable: function (isclickable){
         //Debug.error('setGlobalClickable', isclickable, LzInputTextSprite.prototype.__lastfocus, LzInputTextSprite.prototype.__focusedSprite, LzInputTextSprite.prototype.__lastshown);
         if (! isclickable) {
@@ -198,6 +205,7 @@
             var lzinputproto = LzInputTextSprite.prototype;
             var lastshown = lzinputproto.__lastshown;
             if (lastshown) {
+                LzMouseKernel.__cachedSelection = {s: lastshown, st: lastshown.getSelectionPosition(), sz: lastshown.getSelectionSize()};
                 lastshown.__hide();
                 lzinputproto.__lastshown = null;
             }