Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
iwillwen committed Nov 8, 2014
2 parents 1824db7 + 1973ac5 commit ed1284e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ test/assets/*
node_modules
coverage.html
**.txt
npm_debug.log
npm_debug.log
.gitignore
.npmignore
.dropbox
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![MinDB](http://iwillwen.u.qiniudn.com/min/mindb_logo.png?123)**Database on JavaScript**

Storing and structuring your application data on JavaScript.
Providing a standard *Store Interface* and **Redis**-copy API that you can use in wherever.
Providing a standard *Store Interface* and **Redis**-like API that you can use in wherever.

[Chinese version](https://github.com/iwillwen/mindb/blob/master/README_zhcn.md)

Expand Down Expand Up @@ -119,8 +119,9 @@ Contribution is welcome.There are more than one way to contribute, and I will ap
- send patch with github pull request
- donate MinDB

## Donate us
[![Donate with Alipay](http://iwillwen.u.qiniudn.com/donate-with-alipay.png)](http://me.alipay.com/iwillwen)
## Donate
Because of the Alipay donate page service had been stopped so if you want to support our job, please transfer to my Alipay account(willwengunn@gmail.com) manually. Thanks.
PayPal is welcome too: willwengunn@gmail.com

## git-flow
We recommend you to use [`git-flow`](https://github.com/nvie/gitflow) to make a patch.
Expand Down
4 changes: 2 additions & 2 deletions examples/stores/node_with_file/filestore.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ FileStore.prototype.remove = function(key, callback) {

delete self.buffer[key];

fs.writeFile(self.filename, JSON.stringify(self.buffer)[, callback]);
fs.writeFile(self.filename, JSON.stringify(self.buffer), callback);
});
} else {
delete self.buffer[key];

fs.writeFile(self.filename, JSON.stringify(self.buffer)[, callback]);
fs.writeFile(self.filename, JSON.stringify(self.buffer), callback);
}
};

Expand Down

0 comments on commit ed1284e

Please sign in to comment.