Merge branch 'master' of ssh://212.235.189.51:22122/codeq-web

1 files changed, 17 insertions, 15 deletions

diff --git a/js/codeq/settings.js b/js/codeq/settings.js
index 252a2ea..dd844a5 100644
--- a/js/codeq/settings.js
+++ b/js/codeq/settings.js
@@ -3,12 +3,13 @@
  */
 (function(){
 
-    var guiLangSelect = $("#gui_lang_select");
-    var previousLang = guiLangSelect.val();
-    var closedWithSave = false;
+    var guiLangSelect = $('#gui_lang_select'),
+        robotAddressInput = $('#robot_address_input'),
+        previousGuiLang = guiLangSelect.val(),
+        closedWithSave = false;
 
     guiLangSelect.on("change",function() {
-        var lang = $("#gui_lang_select").val();
+        var lang = guiLangSelect.val();
         if (lang in codeq.supportedLangs) {
             codeq.setLang(lang);
         }
@@ -20,20 +21,21 @@
 
     $("#settings_dropdown_menu").on("shown.bs.dropdown", function() {
         closedWithSave = false;
-        previousLang = codeq.getLang();
+        previousGuiLang = codeq.settings['gui_lang'];
     }).on("hidden.bs.dropdown", function() {
         if(closedWithSave){
-            var lang = $("#gui_lang_select").val();
-            if (lang in codeq.supportedLangs) {
-                codeq.comms.updateSettings({'gui_lang': lang})
-                    .then(function (data) {
-                        if (data.code !== 0) throw new Error('Change language failed, code: ' + data.code + ', message: ' + data.message);//error msg if something went wring while saving to db
-                    })
-                    .done();
-            }
+            codeq.settings['robot_address'] = robotAddressInput.val();
+            codeq.comms.updateSettings(codeq.settings)
+                .then(function (data) {
+                    if (data.code !== 0) {
+                        throw new Error('Updating settings failed, code: ' + data.code + ', message: ' + data.message);
+                    }
+                })
+                .done();
         }else{
-            $("#gui_lang_select").val(previousLang);
-            if (previousLang in codeq.supportedLangs) codeq.setLang(previousLang);
+            guiLangSelect.val(previousGuiLang);
+            if (previousGuiLang in codeq.supportedLangs) codeq.setLang(previousGuiLang);
+            robotAddressInput.val(codeq.settings['robot_address']);
         }
     });
 })();