不要怂,就是干,撸起袖子干!

Commit caba7e8e by Sascha Depold

Merge pull request #319 from guersam/master

fix options priority (add to #315)
2 parents bc4d02b8 1ff54933
Showing with 1 additions and 1 deletions
...@@ -60,7 +60,7 @@ module.exports = (function() { ...@@ -60,7 +60,7 @@ module.exports = (function() {
} }
DAOFactory.prototype.sync = function(options) { DAOFactory.prototype.sync = function(options) {
options = Utils._.extend(options || {}, this.options) options = Utils._.extend({}, this.options, options || {})
var self = this var self = this
return new Utils.CustomEventEmitter(function(emitter) { return new Utils.CustomEventEmitter(function(emitter) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!