[Laszlo-checkins] r12343 - in openlaszlo/branches/4.2: . WEB-INF/lps/lfc/kernel/swf WEB-INF/lps/lfc/views

[ptw@openlaszlo.org]

Author: ptw
Date: 2009-01-07 13:01:01 -0800 (Wed, 07 Jan 2009)
New Revision: 12343

Modified:
   openlaszlo/branches/4.2/
   openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzTextSprite.as
   openlaszlo/branches/4.2/WEB-INF/lps/lfc/views/LzInputText.lzs
Log:
Merged revisions 12322 via svnmerge from 
http://svn.openlaszlo.org/openlaszlo/trunk

.......
  r12322 | bargull | 2009-01-07 03:27:03 -0500 (Wed, 07 Jan 2009) | 28 lines
  
  Change 20090107-bargull-U15 by bargull at dell--p4--2-53 on 2009-01-07 00:57:35
      in /home/Admin/src/svn/openlaszlo/trunk
      for http://svn.openlaszlo.org/openlaszlo/trunk
  
  Summary: fix strange 13 character multiline inputtext bug
  
  New Features:
  
  Bugs Fixed: LPP-7569
  
  Technical Reviewer: max
  QA Reviewer: fgou
  Doc Reviewer: (pending)
  
  Documentation:
  
  Release Notes:
  
  Details:
  The selection needs to recreated so the insertion point stays correct.
  Also update the setter in inputtext.
  (btw, it's 13 characters because in "getTextHeight()" the htmlText is set to "__ypgSAMPLE__", which is exactly 13 characters long.)
      
  
  Tests:
  see both testcases at LPP-7569
.......



Property changes on: openlaszlo/branches/4.2
___________________________________________________________________
Name: svnmerge-integrated
   - /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /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-12154,12172-12175,12177-12185,12187-12194,12196,12201,12208,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12321,12323
   + /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /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-12154,12172-12175,12177-12185,12187-12194,12196,12201,12208,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323

Modified: openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzTextSprite.as
===================================================================
--- openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzTextSprite.as	2009-01-07 20:56:55 UTC (rev 12342)
+++ openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzTextSprite.as	2009-01-07 21:01:01 UTC (rev 12343)
@@ -1,7 +1,7 @@
 /**
   * LzTextSprite.as
   *
-  * @copyright Copyright 2001-2008 Laszlo Systems, Inc.  All Rights Reserved.
+  * @copyright Copyright 2001-2009 Laszlo Systems, Inc.  All Rights Reserved.
   *            Use is subject to license terms.
   *
   * @topic Kernel
@@ -324,6 +324,14 @@
         var tct = textclip.htmlText;
         var tcp = textclip.wordWrap;
 
+        var sf = targetPath(textclip);
+        var start = -1, end;
+        if (Selection.getFocus() === sf) {
+            // we need to reset selection when the textclip is focused (LPP-7569)
+            start = Selection.getBeginIndex();
+            end = Selection.getEndIndex();
+        }
+
         textclip.autoSize = true;
         // Make sure the test text does not wrap!
         textclip.wordWrap = false;
@@ -335,6 +343,10 @@
         textclip.htmlText = tct;
         textclip._width   = tcw;
         textclip._height  = tch;
+
+        if (start != -1) {
+            Selection.setSelection(start, end);
+        }
     }
     return h;
 }

Modified: openlaszlo/branches/4.2/WEB-INF/lps/lfc/views/LzInputText.lzs
===================================================================
--- openlaszlo/branches/4.2/WEB-INF/lps/lfc/views/LzInputText.lzs	2009-01-07 20:56:55 UTC (rev 12342)
+++ openlaszlo/branches/4.2/WEB-INF/lps/lfc/views/LzInputText.lzs	2009-01-07 21:01:01 UTC (rev 12343)
@@ -1,6 +1,6 @@
 /**
   *
-  * @copyright Copyright 2001-2008 Laszlo Systems, Inc.  All Rights Reserved.
+  * @copyright Copyright 2001-2009 Laszlo Systems, Inc.  All Rights Reserved.
   *            Use is subject to license terms.
   *
   * @access public
@@ -187,7 +187,7 @@
         if ( this.multiline && 
              this.sizeToHeight && 
              this.height != isprite.getTextfieldHeight() ) {
-            this.setHeight(isprite.getTextfieldHeight());
+            this.$lzc$set_height(isprite.getTextfieldHeight());
         }
         if (this.ontext.ready) this.ontext.sendEvent(value);
     } else if (eventname == 'onblur') {