RenderContext should mixin Sammy.Object (for log, etc)

ericelliott · Oct 14, 2010 · 26613f8 · 26613f8
1 parent 9b8a48e
commit 26613f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/sammy.js b/lib/sammy.js
@@ -91,9 +91,9 @@
   };
 
   if (typeof window.console != 'undefined') {
-    if (_isFunction(console.log.apply)) {
+    if (_isFunction(window.console.log.apply)) {
       Sammy.addLogger(function() {
-        window.console.log.apply(console, arguments);
+        window.console.log.apply(window.console, arguments);
       });
     } else {
       Sammy.addLogger(function() {
@@ -1272,7 +1272,7 @@
     this.waiting          = false;
   };
 
-  $.extend(Sammy.RenderContext.prototype, {
+  Sammy.RenderContext.prototype = $.extend({}, Sammy.Object.prototype, {
 
     // The "core" of the `RenderContext` object, adds the `callback` to the
     // queue. If the context is `waiting` (meaning an async operation is happening)

diff --git a/site b/site