From 5c09c8b7c9cd91a8b5acff41152be14301caee77 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Wed, 25 Jul 2012 00:44:01 -0700
Subject: [PATCH] fixes, events still broken in test driver

---
 packages/liveui/livedocument.js | 28 ++++++++++++++++++++++++----
 packages/liveui/liveui.js       | 21 ++++-----------------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/packages/liveui/livedocument.js b/packages/liveui/livedocument.js
index 6f5bfdc3e5..019659461f 100644
--- a/packages/liveui/livedocument.js
+++ b/packages/liveui/livedocument.js
@@ -153,7 +153,18 @@ Meteor.ui._doc = Meteor.ui._doc || {};
     cx.on_invalidate(Meteor.ui._doc._doCallbacks);
     cx.invalidate();
 
-    return makeFrag(topHtml);
+    var oldNumRanges = Meteor.ui._doc._newRanges.length;
+
+    var topFrag = makeFrag(topHtml);
+
+    // call "materialized" callbacks immediately
+    for(var i=oldNumRanges, N=Meteor.ui._doc._newRanges.length;
+        i<N; i++) {
+      var r = Meteor.ui._doc._newRanges[i];
+      r.materialized && r.materialized();
+    }
+
+    return topFrag;
   };
 
   Meteor.ui._doc.annotate = function(html, options) {
@@ -179,6 +190,9 @@ Meteor.ui._doc = Meteor.ui._doc || {};
       return;
 
     var node = range.firstNode();
+    if (! node)
+      throw new Error("Double-GCed range: "+range.id);
+
     if (! (node.parentNode &&
            (Meteor.ui._isNodeOnscreen(node) ||
             Meteor.ui._doc._isNodeHeld(node)))) {
@@ -194,13 +208,19 @@ Meteor.ui._doc = Meteor.ui._doc || {};
 
   // accepts any (start,end) that the LiveRange constructor does,
   // including just (start) or (frag)
+  // Remove all LiveRanges on the range of nodes from start to end,
+  // properly killing them and cleaning the
+  // nodes.  May be called as cleanNodes(fragment) or cleanNodes(node) as well.
   Meteor.ui._doc.cleanNodes = function(start, end) {
     var wrapper = new Meteor.ui._LiveRange(Meteor.ui._TAG, start, end);
     wrapper.visit(function (isStart, range) {
-      if (isStart && range.live) {
-        range.live = false;
+      if (isStart && ! range.dead) {
         range.dead = true;
-        range.ondead && range.ondead();
+        if (range.live) {
+          // was live before, so fire callback
+          range.live = false;
+          range.ondead && range.ondead();
+        }
       }
     });
     wrapper.destroy(true);
diff --git a/packages/liveui/liveui.js b/packages/liveui/liveui.js
index 56a85bcfb0..2d985cb1ae 100644
--- a/packages/liveui/liveui.js
+++ b/packages/liveui/liveui.js
@@ -81,7 +81,8 @@ Meteor.ui = Meteor.ui || {};
           update(range);
         });
       },
-      eventHandlers: options.events && unpackEventMap(options.events)
+      eventHandlers: options.events && unpackEventMap(options.events),
+      data: options.data
     };
     return Meteor.ui._doc.annotate(html, ann);
   };
@@ -503,22 +504,8 @@ Meteor.ui = Meteor.ui || {};
     // properly disposing of any referenced chunks and cleaning the
     // nodes.  May be called as shuck(fragment) or shuck(node) as well.
     shuck: function (start, end) {
-      var wrapper = new Meteor.ui._LiveRange(Meteor.ui._tag, start, end);
-      wrapper.visit(function (is_start, range) {
-        is_start && Sarge.killRange(range);
-      });
-      wrapper.destroy(true);
-    },
-
-    // Mark a single range as killed and call its finalizer.
-    killRange: function(range) {
-      if (! range.killed) {
-        range.killed = true;
-        // only one of these ever scheduled per range:
-        Sarge.atFlushTime(function() {
-          range.destroyed && range.destroyed();
-        });
-      }
+      // XXX
+      Meteor.ui._doc.cleanNodes(start, end);
     },
 
     // Call f() at next flush time.  If it's already flush time,