diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/codeq/core.js | 2 | ||||
| -rw-r--r-- | js/codeq/login.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/codeq/core.js b/js/codeq/core.js index 9c32279..8d7900d 100644 --- a/js/codeq/core.js +++ b/js/codeq/core.js @@ -386,7 +386,7 @@ 'log': log, - 'settings':{}, + 'settings': {}, 'availableLangs': [], // filled at boot from 'supportedLangs' 'supportedLangs': { diff --git a/js/codeq/login.js b/js/codeq/login.js index 0feaf01..c1f1bd9 100644 --- a/js/codeq/login.js +++ b/js/codeq/login.js @@ -25,7 +25,7 @@ //merge these settings into the already existing default settings var sett = data.settings; - $.merge(true, codeq.settings, sett); + $.extend(codeq.settings, sett); if('lang' in sett && sett['lang'] in codeq.supportedLangs){ codeq.setLang(sett['lang']); $("#gui_lang_select").val(sett['lang']); |