Skip to content

Commit

Permalink
Merge branch 'master' of github.com:sgentle/phantomjs-node
Browse files Browse the repository at this point in the history
  • Loading branch information
sgentle committed Dec 10, 2011
2 parents cc9731f + 3e80631 commit a55aecb
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion shim.js
Expand Up @@ -1629,7 +1629,12 @@ require.define("/shim.coffee", function (require, module, exports, __dirname, __
evaluate: function(fn, cb) {
if (cb == null) cb = function() {};
return cb(page.evaluate(fn));
}
},
render: function(file, cb) {
if (cb == null) cb = function() {};
page.render(file);
cb();
}
});
};

Expand Down

0 comments on commit a55aecb

Please sign in to comment.