Permalink
Browse files

added type checking of `setting`

  • Loading branch information...
1 parent bf6862b commit caeb77364764269b3fe77fabce57f7ef6d7d6dfb @yhpark committed Sep 16, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/application.js
View
2 lib/application.js
@@ -259,7 +259,7 @@ app.set = function(setting, val){
} else if (this.parent) {
return this.parent.set(setting);
}
- } else {
+ } else if ('object' == typeof setting) {
utils.merge(this.settings, setting);
return this;
}

0 comments on commit caeb773

Please sign in to comment.