diff options
| author | Timotej Lazar <timotej.lazar@fri.uni-lj.si> | 2015-10-12 18:46:49 +0200 |
|---|---|---|
| committer | Timotej Lazar <timotej.lazar@fri.uni-lj.si> | 2015-10-12 18:47:51 +0200 |
| commit | 7f6ee31e2c41e005f44910ca0e8044bd75cc8eff (patch) | |
| tree | 366209bd9b5aec5fff482eb5f57592f831ff2825 | |
| parent | 7461c4d6cd1c469bb757167cffb26bc7f99b66cf (diff) | |
Fix: $.extend instead of $.merge settings object
| -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']); |