From e749bd08958a462f57b8492721a04128468656d0 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Wed, 5 Dec 2018 12:12:45 +0100
Subject: Get calibration to work with GUI

---
 python/gui/static/js/odr.js | 48 ++++++++++++++++++---------------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

(limited to 'python/gui/static/js/odr.js')

diff --git a/python/gui/static/js/odr.js b/python/gui/static/js/odr.js
index 0bf7729..50c321c 100644
--- a/python/gui/static/js/odr.js
+++ b/python/gui/static/js/odr.js
@@ -27,19 +27,14 @@ function doApiRequestGET(uri, callback) {
         dataType: 'json',
 
         error: function(data) {
-            if (data.status == 500) {
-                var errorWindow = window.open("", "_self");
-                errorWindow.document.write(data.responseText);
-            }
-            else {
-                console.log(data.responseText);
+            console.log(data.responseText);
 
-                $.gritter.add({ title: 'API',
-                    text: "AJAX failed: " + data.statusText,
-                    image: '/fonts/warning.png',
-                    sticky: true,
-                });
-            }
+            $.gritter.add({ title: 'API',
+                text: "AJAX failed: " + data.statusText,
+                image: '/fonts/warning.png',
+                sticky: false,
+                time: 4000,
+            });
         },
         success: function(data) {
             if (data.status == 'ok') {
@@ -50,7 +45,8 @@ function doApiRequestGET(uri, callback) {
                     title: 'API',
                     text: "API ERROR: " + data.reason,
                     image: '/fonts/warning.png',
-                    sticky: true,
+                    sticky: false,
+                    time: 4000,
                 });
             }
         }
@@ -66,22 +62,15 @@ function doApiRequestPOST(uri, data, callback) {
         data: JSON.stringify(data),
 
         error: function(data) {
-            if (data.status == 500) {
-                var windowObjectReference;
-                var winFeatures = "menubar=yes,location=yes,resizable=yes,scrollbars=yes,status=yes";
-                var errorWindow = window.open("", "Error 500", winFeatures);
-                errorWindow.document.write(data.responseText);
-            }
-            else {
-                console.log(data.responseText);
+            console.log(data.responseText);
 
-                $.gritter.add({
-                    title: 'API',
-                    text: "AJAX failed: " + data.statusText,
-                    image: '/fonts/warning.png',
-                    sticky: true,
-                });
-            }
+            $.gritter.add({
+                title: 'API',
+                text: "AJAX failed: " + data.statusText,
+                image: '/fonts/warning.png',
+                sticky: false,
+                time: 4000,
+            });
         },
 
         success: function(data_in) {
@@ -93,7 +82,8 @@ function doApiRequestPOST(uri, data, callback) {
                     title: 'API',
                     text: "API ERROR: " + data_in.reason,
                     image: '/fonts/warning.png',
-                    sticky: true,
+                    sticky: false,
+                    time: 4000,
                 });
             }
         }
-- 
cgit v1.2.3