Author: max Date: 2008-03-18 14:30:35 -0700 (Tue, 18 Mar 2008) New Revision: 8312
Modified: openlaszlo/branches/pagan-deities/ openlaszlo/branches/pagan-deities/WEB-INF/lps/lfc/kernel/swf/LzInputTextSprite.as openlaszlo/branches/pagan-deities/lps/components/base/basedatacombobox.lzx Log: Merged revisions 8239-8241,8243,8245-8256,8258-8263,8265-8266,8268-8271,8273,8276-8278,8280,8286-8291,8294,8296-8297 via svnmerge from http://svn.openlaszlo.org/openlaszlo/trunk ....... r8239 | max | 2008-03-12 17:18:34 -0700 (Wed, 12 Mar 2008) | 24 lines Change 20080312-maxcarlson-D by [EMAIL PROTECTED] on 2008-03-12 14:57:41 PDT in /Users/maxcarlson/openlaszlo/trunk for http://svn.openlaszlo.org/openlaszlo/trunk Summary: Fix bogus calls to basedatacombobox._updateSelectionByIndex() New Features: Bugs Fixed: LPP-5549 - basedatacombobox.onselect event fires even if selectfirst attribute is set to false Technical Reviewer: promanik QA Reviewer: [EMAIL PROTECTED] Doc Reviewer: (pending) Documentation: Release Notes: Details: Make sure the index is valid in _updateSelectionByIndex(); Tests: See LPP-5549 ....... r8297 | max | 2008-03-17 18:47:45 -0700 (Mon, 17 Mar 2008) | 24 lines Change 20080314-maxcarlson-L by [EMAIL PROTECTED] on 2008-03-14 12:54:25 PDT in /Users/maxcarlson/openlaszlo/trunk for http://svn.openlaszlo.org/openlaszlo/trunk Summary: Reset both horizontal and vertical scrolling after setFocus() New Features: Bugs Fixed: LPP-5450 - Cursor position moves when clicking on inputtext containing text longer than its width Technical Reviewer: promanik QA Reviewer: [EMAIL PROTECTED] Doc Reviewer: (pending) Documentation: Release Notes: Details: Reset scrolling after setFocus() Tests: See LPP-5450. ....... 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,8182,8202 + /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,8202,8239-8241,8243,8245-8256,8258-8263,8265-8266,8268-8271,8273,8276-8278,8280,8286-8291,8294,8296-8297 Modified: openlaszlo/branches/pagan-deities/WEB-INF/lps/lfc/kernel/swf/LzInputTextSprite.as =================================================================== --- openlaszlo/branches/pagan-deities/WEB-INF/lps/lfc/kernel/swf/LzInputTextSprite.as 2008-03-18 20:06:32 UTC (rev 8311) +++ openlaszlo/branches/pagan-deities/WEB-INF/lps/lfc/kernel/swf/LzInputTextSprite.as 2008-03-18 21:30:35 UTC (rev 8312) @@ -187,14 +187,15 @@ LzInputTextSprite.prototype.select = function ( ){ var sf = targetPath(this.__LZtextclip); - // calling setFocus() seems to bash the scroll value, so save it + // calling setFocus() bashes the scroll and hscroll values, so save them var myscroll = this.__LZtextclip.scroll; + var myhscroll = this.__LZtextclip.hscroll; if( Selection.getFocus() != sf ) { Selection.setFocus( sf ); } - this.__LZtextclip.hscroll = 0; - // restore the scroll value + // restore the scroll and hscroll values this.__LZtextclip.scroll = myscroll; + this.__LZtextclip.hscroll = myhscroll; this.__LZtextclip.background = false; } Modified: openlaszlo/branches/pagan-deities/lps/components/base/basedatacombobox.lzx =================================================================== --- openlaszlo/branches/pagan-deities/lps/components/base/basedatacombobox.lzx 2008-03-18 20:06:32 UTC (rev 8311) +++ openlaszlo/branches/pagan-deities/lps/components/base/basedatacombobox.lzx 2008-03-18 21:30:35 UTC (rev 8312) @@ -1,5 +1,5 @@ <!-- * X_LZ_COPYRIGHT_BEGIN *************************************************** -* Copyright 2005-2007 Laszlo Systems, Inc. All Rights Reserved. * +* Copyright 2005-2008 Laszlo Systems, Inc. All Rights Reserved. * * Use is subject to license terms. * * X_LZ_COPYRIGHT_END ****************************************************** --> <!-- @LZX_VERSION@ --> @@ -236,6 +236,7 @@ @keywords private --> <method name="_updateSelectionByIndex" args="index,dontSetValue,isinitvalue"> <![CDATA[ + if (index < 0) return; var dp = new LzDatapointer(this); var nodes = dp.xpathQuery(this.itemdatapath); _______________________________________________ Laszlo-checkins mailing list [email protected] http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
