From 79c36704cad8cda22301aa73428e2e5ea5a8efef Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@cs.wpi.edu>
Date: Fri, 30 Sep 2011 18:17:45 -0400
Subject: [PATCH] adjusting defaults for web-world drawing

---
 image/private/kernel.js | 20 +++++++++++++-------
 web-world/js-impl.js    | 30 ++++++++++++++++--------------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/image/private/kernel.js b/image/private/kernel.js
index 43b160d..6f80ba4 100644
--- a/image/private/kernel.js
+++ b/image/private/kernel.js
@@ -171,19 +171,25 @@ BaseImage.prototype.toDomNode = function(params) {
     var width = that.getWidth();
     var height = that.getHeight();
     var canvas = makeCanvas(width, height);
+    var ctx;
 
-
+    // Try best effort to render to screen at this point.
+    try {
+	ctx = canvas.getContext("2d");
+	that.render(ctx, 0, 0);
+    } catch (e) {
+    }
     // KLUDGE: on IE, the canvas rendering functions depend on a
     // context where the canvas is attached to the DOM tree.
-
     // We initialize an afterAttach hook; the client's responsible
     // for calling this after the dom node is attached to the
     // document.
-    $(canvas).bind('afterAttach',
-                   function(event) {
-	               var ctx = canvas.getContext("2d");
-	               that.render(ctx, 0, 0);
-                   });
+    var onAfterAttach = function(event) {
+        // $(canvas).unbind('afterAttach', onAfterAttach);
+	var ctx = this.getContext("2d");
+	that.render(ctx, 0, 0);
+    };
+    $(canvas).bind('afterAttach', onAfterAttach);
     return canvas;
 };
 
diff --git a/web-world/js-impl.js b/web-world/js-impl.js
index 85b8741..31deb63 100644
--- a/web-world/js-impl.js
+++ b/web-world/js-impl.js
@@ -42,11 +42,9 @@
 
 
 
-
-
-
-
-
+    var shallowCloneNode = function(node) {
+        return node.cloneNode(false);
+    };
 
 
 
@@ -66,7 +64,7 @@
 
 
     var arrayTreeToDomNode = function(tree) {
-        var result = tree[0].cloneNode(false);
+        var result = shallowCloneNode(tree[0]);
         var i;
         for (i = 1; i < tree.length; i++) {
             result.appendChild(arrayTreeToDomNode(tree[i]));
@@ -211,7 +209,7 @@
     MockView.prototype.updateAttr = function(name, value) {
         return this.act(
             function(cursor) {
-                return cursor.replaceNode([$(cursor.node[0].cloneNode(false))
+                return cursor.replaceNode([$(shallowCloneNode(cursor.node[0]))
                                            .attr(name, value).get(0)]
                                           .concat(cursor.node.slice(1)));
             },
@@ -235,7 +233,7 @@
     MockView.prototype.updateCss = function(name, value) {
         return this.act(
             function(cursor) {
-                return cursor.replaceNode([$(cursor.node[0].cloneNode(false))
+                return cursor.replaceNode([$(shallowCloneNode(cursor.node[0]))
                                            .css(name, value).get(0)]
                                           .concat(cursor.node.slice(1)));
             },
@@ -256,7 +254,7 @@
     MockView.prototype.updateFormValue = function(value) {        
         return this.act(
             function(cursor) {
-                return cursor.replaceNode([$(cursor.node[0].cloneNode(false))
+                return cursor.replaceNode([$(shallowCloneNode(cursor.node[0]))
                                            .val(value).get(0)]
                                           .concat(cursor.node.slice(1)));
             },
@@ -419,7 +417,7 @@
     MockView.prototype.show = function() {
         return this.act(
             function(cursor) {
-                return cursor.replaceNode([$(cursor.node[0].cloneNode(false))
+                return cursor.replaceNode([$(shallowCloneNode(cursor.node[0]))
                                            .show().get(0)]
                                           .concat(cursor.node.slice(1)));
             },
@@ -433,7 +431,7 @@
     MockView.prototype.hide = function() {
         return this.act(
             function(cursor) {
-                return cursor.replaceNode([$(cursor.node[0].cloneNode(false))
+                return cursor.replaceNode([$(shallowCloneNode(cursor.node[0]))
                                            .hide().get(0)]
                                           .concat(cursor.node.slice(1)));
             },
@@ -1072,7 +1070,9 @@
 
 
     var defaultToDraw = function(MACHINE, world, view, success, fail) {
-        return success(view);
+        coerseToMockView(world,
+                         success,
+                         fail);
     };
 
 
@@ -1089,8 +1089,10 @@
         var dispatchingEvents = false;
 
         var top = $("<div/>").get(0);
-        var view = (find(handlers, isInitialViewHandler) || { view : new View(top, []) }).view;
-        var stopWhen = (find(handlers, isStopWhenHandler) || { stopWhen: defaultStopWhen }).stopWhen;
+        var view = (find(handlers, isInitialViewHandler) ||
+                    { view : new View($('<div/>').get(0), []) }).view;
+        var stopWhen = (find(handlers, isStopWhenHandler) ||
+                        { stopWhen: defaultStopWhen }).stopWhen;
         var toDraw = (find(handlers, isToDrawHandler) || {toDraw : defaultToDraw} ).toDraw;
 
         var oldOutputPort = MACHINE.params.currentOutputPort;