diff --git a/css/style.css b/css/style.css index 8359a6acc2..60e51227ac 100644 --- a/css/style.css +++ b/css/style.css @@ -277,9 +277,4 @@ input[type="number"]::-webkit-inner-spin-button { border-top: 1px solid #7d7d79; background-color: #bfbeb5; -} - #status-bar .notify { - float: right; - } - #status-bar .notify span { - } \ No newline at end of file +} \ No newline at end of file diff --git a/js/serial_backend.js b/js/serial_backend.js index 2f9b77e02a..8a1d67c509 100644 --- a/js/serial_backend.js +++ b/js/serial_backend.js @@ -134,7 +134,7 @@ function onOpen(openInfo) { // disconnect after 10 seconds with error if we don't get IDENT data GUI.timeout_add('connecting', function() { if (!configuration_received) { - notify('Did not received configuration within 10 seconds, communication failed - Disconnecting'); + GUI.log('Did not received configuration within 10 seconds, communication failed - Disconnecting'); $('div#port-picker a.connect').click(); // disconnect } @@ -155,7 +155,7 @@ function onOpen(openInfo) { }); } else { console.log('Failed to open serial port'); - notify('Failed to open serial port', 'red'); + GUI.log('Failed to open serial port', 'red'); $('div#port-picker a.connect').text('Connect'); $('div#port-picker a.connect').removeClass('active'); @@ -174,7 +174,7 @@ function onClosed(result) { $('#tabs > ul li').removeClass('active'); // de-select any selected tabs tab_initialize_default(); } else { // Something went wrong - notify('Failed to close serial port', 'red'); + GUI.log('Failed to close serial port', 'red'); } } diff --git a/main.html b/main.html index 79e4835977..7b14a09b38 100644 --- a/main.html +++ b/main.html @@ -117,7 +117,6 @@ Packet error: 0 | Firmware Version: 0.0 | Cycle Time: 0 - diff --git a/main.js b/main.js index 41335135dd..e2403635a7 100644 --- a/main.js +++ b/main.js @@ -35,7 +35,7 @@ $(document).ready(function() { $('a', tabs).click(function() { if ($(this).parent().hasClass('active') == false) { // only initialize when the tab isn't already active if (configuration_received == false) { // if there is no active connection, return - notify('You need to connect before you can view any of the tabs', 'red'); + GUI.log('You need to connect before you can view any of the tabs', 'red'); return; } @@ -151,14 +151,6 @@ $(document).ready(function() { }); }); -function notify(message, color) { - $('span.notify').html('' + message + '');+ - $('span.notify span').fadeOut(5000, function() { - $(this).remove(); - }); - -} - function microtime() { var now = new Date().getTime() / 1000; diff --git a/tabs/firmware_flasher.js b/tabs/firmware_flasher.js index 77563666bd..f6d9a62b20 100644 --- a/tabs/firmware_flasher.js +++ b/tabs/firmware_flasher.js @@ -102,7 +102,7 @@ function tab_initialize_firmware_flasher() { if (!GUI.connect_lock) { // button disabled while flashing is in progress tab_initialize_default(); } else { - notify('You can\'t do this right now, please wait for current operation to finish ...'); + GUI.log('You can\'t do this right now, please wait for current operation to finish ...'); } }); });