Skip to content

Commit

Permalink
bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
farthinker committed Oct 14, 2014
1 parent 461e647 commit f723cd3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Module = (function() {
return _results;
}).call(this);
if (this._connected) {
this.opts = $.extend(this._module.opts, this.opts);
this.opts = $.extend({}, this.opts, this._module.opts);
} else {
this._init();
for (_i = 0, _len = instances.length; _i < _len; _i++) {
Expand Down
2 changes: 1 addition & 1 deletion src/module.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Module
@[name] = new cls()

if @_connected
@opts = $.extend @_module.opts, @opts
@opts = $.extend {}, @opts, @_module.opts
else
@_init()
instance._init?() for instance in instances
Expand Down

0 comments on commit f723cd3

Please sign in to comment.