From 7f6ee31e2c41e005f44910ca0e8044bd75cc8eff Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Mon, 12 Oct 2015 18:46:49 +0200
Subject: Fix: $.extend instead of $.merge settings object

---
 js/codeq/core.js  | 2 +-
 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']);
-- 
cgit v1.2.1