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

Thu Mar 5 20:51:17 PST 2009

Author: ptw
Date: 2009-03-05 20:51:15 -0800 (Thu, 05 Mar 2009)
New Revision: 13196

Modified:
   openlaszlo/branches/4.2/
   openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzInputTextSprite.as
Log:
Merged revisions 13195 via svnmerge from 
http://svn.openlaszlo.org/openlaszlo/trunk

.......
  r13195 | ptw | 2009-03-05 23:46:54 -0500 (Thu, 05 Mar 2009) | 18 lines
  
  Change 20090305-ptw-u by ptw at dueling-banjos.home on 2009-03-05 17:21:04 EST
      in /Users/ptw/OpenLaszlo/trunk-3
      for http://svn.openlaszlo.org/openlaszlo/trunk
  
  Summary: Fix regression in input text:  should not interpret HTML markup
  
  Bugs Fixed: LPP-7857  html tags not showing in inputtext
  
  Technical Reviewer: hminsky, a.bargull at intensis.de (Message-ID: <8c61fad60903051513h3dfcd220hb00c0010ce76fee at mail.gmail.com>, pending)
  QA Reviewer: aalappat (pending)
  
  Details:
      html should be off by default in input text
  
  Tests:
      Text case from bug
.......



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,12229,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323,12340-12348,12352,12354-12358,12360-12361,12363,12365-12367,12369-12371,12375-12378,12380-12389,12391,12394-12396,12399-12400,12402-12403,12406-12416,12419-12422,12424-12429,12431-12433,12435,12437-12441,12443,12445,12447,12449-12451,12453-12454,12457-12460,12464,12466-12475,12477-12480,12482-12490,12493-12495,12499-12502,12507-12510,12512,12514-12520,12522,12525-12531,12534-12540,12542,12545,12548-12554,12557-12561,12564,12566-12568,12571,12574-12576,12578,12580,12583-12584,12586-12587,12589,12592-12596,12598-12600,12602-12609,12611-12615,12617,12619-12621,12623,12625,12628-12631,12633-12635,12637,12639,12642,12644,12647-12653,12656,12658,12660,12662-12666,12668-12694,12696,12698-12704,12708-12710,12712-12721,12723-12729,12731-12742,12745-12752,12754-12784,12786-12791,12793-12798,12800-12801,12803,12805-12808,12810-12812,12814,12816-12821,12825-12833,12835-12837,12839-12841,12847,12849-12850,12852-12859,12863-12883,12885-12895,12897-12906,12908-12915,12917-12922,12924-12934,12937-12940,12943-12944,12946-12947,12950-12952,12955-12964,12966-12969,12971,12973-12977,12979-12993,12997-12999,13001-13003,13006-13007,13010-13015,13017-13020,13022-13024,13026-13031,13033,13035-13037,13039-13040,13043,13046-13052,13055-13060,13062-13069,13071-13072,13074,13076-13085,13087-13093,13095-13101,13103-13104,13106,13108-13110,13112,13114-13120,13122,13125-13126,13129,13132-13136,13139-13140,13142,13147,13157-13158,13163,13167,13176,13186,13188
   + /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,12229,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323,12340-12348,12352,12354-12358,12360-12361,12363,12365-12367,12369-12371,12375-12378,12380-12389,12391,12394-12396,12399-12400,12402-12403,12406-12416,12419-12422,12424-12429,12431-12433,12435,12437-12441,12443,12445,12447,12449-12451,12453-12454,12457-12460,12464,12466-12475,12477-12480,12482-12490,12493-12495,12499-12502,12507-12510,12512,12514-12520,12522,12525-12531,12534-12540,12542,12545,12548-12554,12557-12561,12564,12566-12568,12571,12574-12576,12578,12580,12583-12584,12586-12587,12589,12592-12596,12598-12600,12602-12609,12611-12615,12617,12619-12621,12623,12625,12628-12631,12633-12635,12637,12639,12642,12644,12647-12653,12656,12658,12660,12662-12666,12668-12694,12696,12698-12704,12708-12710,12712-12721,12723-12729,12731-12742,12745-12752,12754-12784,12786-12791,12793-12798,12800-12801,12803,12805-12808,12810-12812,12814,12816-12821,12825-12833,12835-12837,12839-12841,12847,12849-12850,12852-12859,12863-12883,12885-12895,12897-12906,12908-12915,12917-12922,12924-12934,12937-12940,12943-12944,12946-12947,12950-12952,12955-12964,12966-12969,12971,12973-12977,12979-12993,12997-12999,13001-13003,13006-13007,13010-13015,13017-13020,13022-13024,13026-13031,13033,13035-13037,13039-13040,13043,13046-13052,13055-13060,13062-13069,13071-13072,13074,13076-13085,13087-13093,13095-13101,13103-13104,13106,13108-13110,13112,13114-13120,13122,13125-13126,13129,13132-13136,13139-13140,13142,13147,13157-13158,13163,13167,13176,13186,13188,13195

Modified: openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzInputTextSprite.as
===================================================================

--- openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzInputTextSprite.as	2009-03-06 04:46:54 UTC (rev 13195)
+++ openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzInputTextSprite.as	2009-03-06 04:51:15 UTC (rev 13196)
@@ -74,8 +74,13 @@
 LzInputTextSprite.prototype.__initTextProperties = function (args) {
     var textclip = this.__LZtextclip;
 
-    // conditionalize this; set to false for inputtext for back compatibility with lps 2.1
-    textclip.html = true;
+    // NOTE [2009-03-05 ptw] Input text is NOT html by default.  We
+    // used to set this to true to fudge in the font styles as markup,
+    // but now we use the clip textFormat to do that directly.  Note
+    // that by setting this to false, the uses of htmlText below are
+    // equivalent to using text; whereas if you enable html with
+    // setHTML, then this should all magically work. :)
+    textclip.html = false;
 
     textclip.selectable = args.selectable;
     textclip.autoSize = false;
@@ -277,6 +282,10 @@
 }
 
 // This is the text without any formatting
+// NOTE [2009-03-05 ptw] Which is presumably what you want.  If you
+// enable html with setHTML, you still will get the text without
+// formatting.  But, how would you enter formatting in an input field
+// anyways?  This is not a rich-edit-text doo-dad.
 LzInputTextSprite.prototype.getText = function ( ){
   // We normalize swf's \r to \n
   return this.__LZtextclip.text.split('\r').join('\n');

