fixed event handling to use monad env

notebook.cs

@@ -153,14 +153,19 @@ exBox.removeChild exBox.lastChild
 
 prepExpr = (txt)-> if txt[0] in '=!' then txt else "=#{txt}"
 
-envFor = (exBox)->
-  write: (msg)-> exBox.innerHTML += msg + "<br>"
+envFor = (box)->
+  exBox = getBox box
+  write: (msg)->
+    div = document.createElement('div')
+    div.innerHTML = "#{msg}\n"
+    exBox.appendChild(div)
   prompt:(msg, cont)-> cont(window.prompt(msg))
 
 makeOutputBox = (source)->
   node = document.createElement 'div'
   node.setAttribute 'LeisureOutput', ''
   node.setAttribute 'Leisure', ''
+  node.setAttribute 'LeisureBox', ''
   node.setAttribute 'class', 'output'
   node.setAttribute 'contentEditable', 'false'
   node.source = source
@@ -283,5 +288,6 @@ nodeEnd child
 root.bindNotebook = bindNotebook
 root.evalOutput = evalOutput
 root.cleanOutput = cleanOutput
+root.envFor = envFor
 #root.selection = -> window.getSelection().getRangeAt(0)
 #root.test = -> flatten(root.selection().cloneContents().childNodes[0])

notebook.js

@@ -240,10 +240,15 @@
     }
   };
 
-  envFor = function envFor(exBox) {
+  envFor = function envFor(box) {
+    var exBox;
+    exBox = getBox(box);
     return {
       write: function write(msg) {
-        return exBox.innerHTML += msg + "<br>";
+        var div;
+        div = document.createElement('div');
+        div.innerHTML = "" + msg + "\n";
+        return exBox.appendChild(div);
       },
       prompt: function prompt(msg, cont) {
         return cont(window.prompt(msg));
@@ -256,6 +261,7 @@
     node = document.createElement('div');
     node.setAttribute('LeisureOutput', '');
     node.setAttribute('Leisure', '');
+    node.setAttribute('LeisureBox', '');
     node.setAttribute('class', 'output');
     node.setAttribute('contentEditable', 'false');
     node.source = source;
@@ -447,4 +453,6 @@
 
   root.cleanOutput = cleanOutput;
 
+  root.envFor = envFor;
+
 }).call(this);

prim.cs

@@ -68,10 +68,10 @@ cont Math.floor(from() + Math.random() * (to() - from() + 1))
 eventCmds = []
 running = false
 
-leisureEvent = (leisureFuncName, evt)->
+leisureEvent = (leisureFuncName, evt, env)->
   currentEvent = evt
   monad = Leisure.eval("#{Leisure.nameSub(leisureFuncName)}()")(laz(evt))
-  runMonad monad, defaultEnv, ->
+  runMonad monad, (env ? defaultEnv), ->
 
 runMonad = (monad, env, cont)->
   eventCmds.push ->
@@ -86,6 +86,8 @@ cont Math.floor(from() + Math.random() * (to() - from() + 1))
 runMonads = (monad, env, cont)->
   if monad?.cmd?
     monad.cmd env, (value) ->
+      #change to this use setTimeout, kind of like this (which doesn't quite work)
+      #if monad.binding? then global.setTimeout((->runMonads monad.binding(-> value), env, cont), 1)
       if monad.binding? then runMonads monad.binding(-> value), env, cont
       else cont(value)
   else throw new Error("Attempted to run something that's not a monad")

ttt_v2.html

@@ -18,11 +18,15 @@
     <script src="ttt.js"></script>
 
     <script>//<[!CDATA[
-
+	function initSVG(el) {
+	  el.getSVGDocument().defaultView.leisureEnv = el.leisureEnv = Notebook.envFor(el);
+	  //delay this to the next cycle
+	  window.setTimeout(tttLoaded, 1);
+	}
 	function tttLoaded()
 	{
 	  tttWin = document.getElementById('scene').getSVGDocument().defaultView
-          tttWin.leisureEvent = function(funcName) {Prim.leisureEvent(funcName, tttWin.event);}
+          tttWin.leisureEvent = function(funcName) {Prim.leisureEvent(funcName, tttWin.event, tttWin.leisureEnv);}
 	  tttWin.leisureEvent('newGame')
 	}
 
@@ -200,7 +204,7 @@
 	    <pre style="position: absolute; width: 100%; min-height: 100%; margin: 0; padding: 0" id="editor" class="cell" contentEditable="true">
 
 
-svg-map = hash-from-list [ 'id', 'scene', 'data', 'ttt.svg', 'onload', 'tttLoaded()', 'width', 500, 'height', 600 ]
+svg-map = hash-from-list [ 'id', 'scene', 'data', 'ttt.svg', 'onload', 'initSVG(this)', 'width', 500, 'height', 600 ]
 
 svg-file svg-map