mirror of
https://github.com/logsol/chuck.js.git
synced 2026-05-11 10:37:34 +00:00
Fixes some bugs from bulk renaming singleton object variables
Related to #128
This commit is contained in:
parent
91e0e7af3f
commit
45ea2dfba3
1 changed files with 2 additions and 2 deletions
|
|
@ -10,7 +10,7 @@ function (Exception) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
optionsHelper.prototype.merge = function(options, preset) {
|
OptionsHelper.prototype.merge = function(options, preset) {
|
||||||
|
|
||||||
if(!preset && !options) {
|
if(!preset && !options) {
|
||||||
throw new Exception("OptionsHelper requires objects");
|
throw new Exception("OptionsHelper requires objects");
|
||||||
|
|
@ -43,7 +43,7 @@ function (Exception) {
|
||||||
if(options[key].constructor !== Object) {
|
if(options[key].constructor !== Object) {
|
||||||
preset[key] = options[key];
|
preset[key] = options[key];
|
||||||
} else {
|
} else {
|
||||||
preset[key] = optionsHelper.prototype.merge.call(this, options[key], preset[key]);
|
preset[key] = OptionsHelper.prototype.merge.call(this, options[key], preset[key]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue