Permalink
Browse files

Merge branch 'master' of github.com:silentrob/Apricot

  • Loading branch information...
2 parents 5541638 + 51dcf73 commit bd3dba49bfc373630b97efd8df717f943a15a055 @silentrob committed May 10, 2012
Showing with 10 additions and 8 deletions.
  1. +1 −1 README.md
  2. +6 −6 lib/apricot.js
  3. +3 −1 package.json
View
@@ -23,7 +23,7 @@ Getting Started
// Do something awesome here..
});
- // Expieremental Live Code, third param.
+ // Experimental Live Code, third param.
// Live mode will evaluate all javascript in the context of the page.
Apricot.open( file, callback, live_mode)
View
@@ -44,11 +44,9 @@ Apricot.prototype = {
var m = [];
var sizzleSandbox = {};
var sizzle = require("./sizzle").sizzleInit(sizzleSandbox,this.document);
- m = sizzle(pattern);
- for (var i = 0, len = m.length; i < len; ++i) {
- this.matches.push(m[i]);
- }
+ this.matches = sizzle(pattern);
+
return this;
},
@@ -292,11 +290,13 @@ Apricot.prototype = {
//
Apricot.parse = function (data, callback) {
try {
- callback(null, new Apricot(data));
+ var a = new Apricot(data);
}
catch (error) {
- callback(error);
+ return callback(error);
}
+
+ callback(null, a);
}
//
View
@@ -37,12 +37,14 @@
"os": [
"linux",
"macos",
+ "darwin",
"win"
],
"cpu": [
"x86",
"ppc",
- "x86_64"
+ "x86_64",
+ "x64"
],
"engines": [
"node"

0 comments on commit bd3dba4

Please sign in to comment.