Author: max
Date: 2007-10-24 08:55:48 -0700 (Wed, 24 Oct 2007)
New Revision: 6987

Modified:
   openlaszlo/branches/wafflecone/
   openlaszlo/branches/wafflecone/lps/components/utils/replicator/replicator.lzx
Log:
Change 20071023-maxcarlson-z by [EMAIL PROTECTED] on 2007-10-23 14:48:21 PDT
    in /Users/maxcarlson/openlaszlo/wafflecone
    for http://svn.openlaszlo.org/openlaszlo/branches/wafflecone

Summary: Merge replicator changes from trunk to wafflecone

New Features:

Bugs Fixed: LPP-4664 - test/explicit-replicators/replicator.lzx visually 
deletes last two items when the second-to-last item is clicked and ...

Technical Reviewer: promanik
QA Reviewer: jcrowley
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details: ~/openlaszlo/wafflecone maxcarlson$ ~/openlaszlo/tools/svn/svnmerge.py 
 merge -r 6604 -S ../trunk
    

Tests: See LPP-4664




Property changes on: openlaszlo/branches/wafflecone
___________________________________________________________________
Name: svnmerge-integrated
   - 
/openlaszlo/branches/legals:1-5746,5748-5756,5758-5770,5772-5819,5821-5860,5862-5890,5892-6065,6068-6177,6179-6228,6230-6236,6241-6266
 
/openlaszlo/trunk:1-3892,3894-3952,3954-4393,4395-4461,4463-4467,4469-4471,4473-5085,5087-5171,5173-5203,5205-5209,5211-5331,5333-5334,6531-6532,6534-6538,6540-6547,6549,6551-6558,6560-6567,6569-6581,6583-6586,6588,6590-6603,6605-6607,6610-6611,6613-6622,6624-6629,6632-6636,6638-6639,6641-6642,6646-6648,6653,6656-6663,6665-6669,6671-6683,6685-6686,6688-6706,6708-6715
   + 
/openlaszlo/branches/legals:1-5746,5748-5756,5758-5770,5772-5819,5821-5860,5862-5890,5892-6065,6068-6177,6179-6228,6230-6236,6241-6266
 
/openlaszlo/trunk:1-3892,3894-3952,3954-4393,4395-4461,4463-4467,4469-4471,4473-5085,5087-5171,5173-5203,5205-5209,5211-5331,5333-5334,6531-6532,6534-6538,6540-6547,6549,6551-6558,6560-6567,6569-6581,6583-6586,6588,6590-6607,6610-6611,6613-6622,6624-6629,6632-6636,6638-6639,6641-6642,6646-6648,6653,6656-6663,6665-6669,6671-6683,6685-6686,6688-6706,6708-6715

Modified: 
openlaszlo/branches/wafflecone/lps/components/utils/replicator/replicator.lzx
===================================================================
--- 
openlaszlo/branches/wafflecone/lps/components/utils/replicator/replicator.lzx   
    2007-10-24 14:55:55 UTC (rev 6986)
+++ 
openlaszlo/branches/wafflecone/lps/components/utils/replicator/replicator.lzx   
    2007-10-24 15:55:48 UTC (rev 6987)
@@ -137,19 +137,29 @@
       super.init.apply(this, arguments);
       if (this.dataset && this.xpath) {
         this._pointer = this.dataset.getPointer();
-        this._ondatadel = new LzDelegate(this, '_updateChildren', 
this._pointer.p, 'onDocumentChange')
+        this._ondatadel = new LzDelegate(this, '_updateChildren', 
this.dataset, 'onDocumentChange')
         this._updateChildren();
       }
     }
 
+    function destroy() {
+        if (this['_ondatadel']) this._ondatadel.unregisterAll();
+        this._pointer = null;
+        this.dataset = null;
+        super.destroy.apply(this, arguments);
+    }
+
     // @keywords private
-    function _updateChildren(c) {
+    function _updateChildren() {
         // TODO: use changepackage to do something smarter here
-        this.setNodes(this._pointer.xpathQuery(this.xpath))
+        var p = this._pointer.xpathQuery(this.xpath);
+        if (p && ! p['length']) p = [p]; 
+        this.setNodes(p)
     }
 
     //     @keywords private
     function createChildren (c) {
+        super.createChildren( [] ); 
         this.replicated = c.pop();
         
         //Debug.write( 'replicated', replicated );
@@ -300,7 +310,7 @@
 
     //  @keywords private
     function __adjustVisibleClones () {
-        var p = this.parent;
+        var p = this.container;
         for (var l in p.layouts) {
             p.layouts[l].lock();
         }


_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins

Reply via email to