Merge branch 'refs/heads/master' into runestone

Conflicts: src/lib/image/__init__.js Signed-off-by: Brad Miller <bonelake@gmail.com>
Duncanr-glitch · Sep 21, 2012 · 9c71318 · 9c71318
2 parents bd4e358 + 7cc8169
commit 9c71318
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/abstract.js b/src/abstract.js
@@ -142,6 +142,9 @@ Sk.abstr.numOpAndPromote = function(a, b, opfn)
         } else																		// RNL
             return ans;
     }
+	else if (a === undefined || b === undefined) {
+		throw new Sk.builtin.NameError('Undefined variable in expression')
+	}
     else if (a.constructor === Sk.builtin.lng && typeof b === "number")
         return [a, Sk.builtin.lng.fromInt$(b)];
     else if (b.constructor === Sk.builtin.lng && typeof a === "number")

diff --git a/src/errors.js b/src/errors.js
@@ -165,3 +165,4 @@ Sk.builtin.ZeroDivisionError.prototype.tp$name = "ZeroDivisionError";
 Sk.builtin.TimeLimitError = function(args) { Sk.builtin.Exception.apply(this, arguments); }
 goog.inherits(Sk.builtin.TimeLimitError, Sk.builtin.Exception);
 Sk.builtin.TimeLimitError.prototype.tp$name = "TimeLimitError";
+goog.exportSymbol("Sk.builtin.TimeLimitError", Sk.builtin.TimeLimitError);
diff --git a/src/lib/turtle/__init__.js b/src/lib/turtle/__init__.js
@@ -212,7 +212,7 @@ if (! TurtleGraphics) {
         $(this.canvas).click(function() {
             if (! theCanvas.isAnimating()) {
 				if (Sk.tg.fadeOnExit)	//	Let's this be configurable
-                	$("#"+canvas_id).fadeOut();
+                	$("#"+canvas_id).hide();
                 $("#"+canvas_id).unbind('click');
                 Sk.tg.canvasInit = false;
                 delete Sk.tg.canvasLib[canvas_id];