[Laszlo-checkins] r10241 - in openlaszlo/branches/4.1: . WEB-INF/lps/lfc/kernel/swf lps/components/base
max@openlaszlo.org
max at openlaszlo.org
Mon Jul 7 17:54:23 PDT 2008
Author: max
Date: 2008-07-07 17:53:52 -0700 (Mon, 07 Jul 2008)
New Revision: 10241
Modified:
openlaszlo/branches/4.1/
openlaszlo/branches/4.1/WEB-INF/lps/lfc/kernel/swf/LzSprite.as
openlaszlo/branches/4.1/lps/components/base/basegrid.lzx
openlaszlo/branches/4.1/lps/components/base/basegridcolumn.lzx
openlaszlo/branches/4.1/lps/components/base/basegridrow.lzx
Log:
Merged revisions 10219 via svnmerge from
http://svn.openlaszlo.org/openlaszlo/trunk
.......
r10219 | bargull | 2008-07-04 10:16:45 -0700 (Fri, 04 Jul 2008) | 26 lines
Change 20080703-bargull-r5m by bargull at dell--p4--2-53 on 2008-07-03 22:43:07
in /home/Admin/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Fix debug-warnings in grid
New Features:
Bugs Fixed: LPP-6605
Technical Reviewer: promanik
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Use proper delegate-handling in LzSprite,
updated column->cell dependency to avoid debug-message about a "dynamic method".
Tests:
.......
Property changes on: openlaszlo/branches/4.1
___________________________________________________________________
Name: svnmerge-integrated
- /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825 /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-10153,10183,10209-10211,10218
+ /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825 /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-10153,10183,10209-10211,10218-10219
Modified: openlaszlo/branches/4.1/WEB-INF/lps/lfc/kernel/swf/LzSprite.as
===================================================================
--- openlaszlo/branches/4.1/WEB-INF/lps/lfc/kernel/swf/LzSprite.as 2008-07-08 00:39:07 UTC (rev 10240)
+++ openlaszlo/branches/4.1/WEB-INF/lps/lfc/kernel/swf/LzSprite.as 2008-07-08 00:53:52 UTC (rev 10241)
@@ -1348,7 +1348,7 @@
if (! this._moDel) {
this._moDel = new LzDelegate( this , '_cursorGotMouseover',
this.owner , 'onmouseover');
- this._muDel = new LzDelegate( LzMouseKernel , 'restoreCursor',
+ this._muDel = new LzDelegate( this , '_cursorGotMouseout',
this.owner , 'onmouseout');
}
@@ -1373,6 +1373,11 @@
LzMouseKernel.setCursorGlobal(this._cures);
}
+/** @access private */
+LzSprite.prototype._cursorGotMouseout = function(ignore) {
+ LzMouseKernel.restoreCursor();
+}
+
/**
* @access private
*/
Modified: openlaszlo/branches/4.1/lps/components/base/basegrid.lzx
===================================================================
--- openlaszlo/branches/4.1/lps/components/base/basegrid.lzx 2008-07-08 00:39:07 UTC (rev 10240)
+++ openlaszlo/branches/4.1/lps/components/base/basegrid.lzx 2008-07-08 00:53:52 UTC (rev 10241)
@@ -440,7 +440,7 @@
</method>
<!--- @keywords private -->
- <method name="inferColumns" args="v">
+ <method name="inferColumns" args="ignore=null" >
<![CDATA[
var res = this.datapath.xpathQuery( this.contentdatapath );
if ( ! res ) return;
Modified: openlaszlo/branches/4.1/lps/components/base/basegridcolumn.lzx
===================================================================
--- openlaszlo/branches/4.1/lps/components/base/basegridcolumn.lzx 2008-07-08 00:39:07 UTC (rev 10240)
+++ openlaszlo/branches/4.1/lps/components/base/basegridcolumn.lzx 2008-07-08 00:53:52 UTC (rev 10241)
@@ -89,24 +89,32 @@
return parent.content;
} else {
return super.determinePlacement.apply(this, arguments);
-// return super.determinePlacement( v , p , args );
}
</method>
<!--- @keywords private -->
<method name="_getCellForColumn">
- if ( !_contentsPackage ) return null;
-
- if ( _contentsPackage.length == 1 ) {
- var o = _contentsPackage[ 0 ];
- o.attrs.ownerColumn = this;
+ if ( !this._contentsPackage ) return null;
+
+ var fupdCellBounds = function(ignore=null) {
+ //'this' points to the grid cell
+ this.setX( this.ownerColumn.x );
+ this.setWidth( this.ownerColumn.colwidth );
+ };
+
+ var contentspkg = this._contentsPackage;
+ if ( contentspkg.length == 1 ) {
+ var o = contentspkg[ 0 ];
+ var cellargs = o.attrs;
+ cellargs.ownerColumn = this;
+ cellargs._updateCellBounds = fupdCellBounds;
return o;
+ } else {
+ //there's more than one subview, so we need to pack them up
+ return { 'class': lz.view,
+ attrs: {ownerColumn: this, _updateCellBounds: fupdCellBounds},
+ children: contentspkg };
}
-
- //else, there's more than one subview, so we need to pack them up
- return { 'class': lz.view,
- attrs: { ownerColumn : this },
- children: _contentsPackage };
</method>
<!--- @keywords private -->
Modified: openlaszlo/branches/4.1/lps/components/base/basegridrow.lzx
===================================================================
--- openlaszlo/branches/4.1/lps/components/base/basegridrow.lzx 2008-07-08 00:39:07 UTC (rev 10240)
+++ openlaszlo/branches/4.1/lps/components/base/basegridrow.lzx 2008-07-08 00:53:52 UTC (rev 10241)
@@ -185,14 +185,8 @@
its column owner.-->
<handler name="onaddsubview" args="sv">
if ( !sv [ "ownerColumn"] ) return;
- sv._updateIt = this._updateIt;
- var d = new LzDelegate( sv , "_updateIt", sv.ownerColumn,"onx");
- d.register( sv.ownerColumn,"oncolwidth" );
- sv._updateIt();
+ sv.applyConstraintMethod("_updateCellBounds", [sv.ownerColumn, "x", sv.ownerColumn, "colwidth"]);
</handler>
- <attribute name="_updateIt"
- value="function(ignore){this.setX( this.ownerColumn.x );
- this.setWidth( this.ownerColumn.colwidth)}"/>
<doc>
<tag name="shortdesc"><text></text></tag>
<text>
More information about the Laszlo-checkins
mailing list