From c9ce37290f288853bd6bb33683d3576c8261c88a Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Mon, 9 Jul 2018 20:35:20 +0200 Subject: [PATCH] - fixed some UI problems that get broken with one of the last commits --- js/app/ui/system_info.js | 2 +- js/app/ui/system_signature.js | 4 +++- public/js/v1.3.6/app/map/util.js | 16 +++++++--------- public/js/v1.3.6/app/ui/system_info.js | 2 +- public/js/v1.3.6/app/ui/system_signature.js | 4 +++- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/js/app/ui/system_info.js b/js/app/ui/system_info.js index 13a6cf41..ecfbf6a3 100644 --- a/js/app/ui/system_info.js +++ b/js/app/ui/system_info.js @@ -146,7 +146,7 @@ define([ nameRowElement.addCharacterInfoTooltip( tooltipData ); } - moduleElement.hideLoadingAnimation(); + moduleElement.find('.' + config.descriptionArea).hideLoadingAnimation(); }; /** diff --git a/js/app/ui/system_signature.js b/js/app/ui/system_signature.js index d6c52178..0f89fb84 100644 --- a/js/app/ui/system_signature.js +++ b/js/app/ui/system_signature.js @@ -277,7 +277,7 @@ define([ } // set new value - updateCell.data( data ).draw(); + updateCell.data(data).draw(); if(cellIndex === 7){ updateCellElement.initTimestampCounter(); @@ -584,6 +584,8 @@ define([ moduleElement: moduleElement } }).done(function(responseData){ + // unlock table for update + unlockSignatureTable(true); // updates table with new/updated signature information updateSignatureTable(this.moduleElement, responseData.signatures, false); }).fail(function( jqXHR, status, error) { diff --git a/public/js/v1.3.6/app/map/util.js b/public/js/v1.3.6/app/map/util.js index 0c68dbc6..61dce3a2 100644 --- a/public/js/v1.3.6/app/map/util.js +++ b/public/js/v1.3.6/app/map/util.js @@ -1330,10 +1330,15 @@ define([ return url; }; + /** + * request system data + * @param requestData + * @param context + * @returns {Promise} + */ let requestSystemData = (requestData, context) => { let requestSystemDataExecutor = (resolve, reject) => { - $.ajax({ url: Init.path.getSystemData, type: 'POST', @@ -1351,14 +1356,7 @@ define([ console.warn('Missing systemData in response!', requestData); } }).fail(function( jqXHR, status, error) { - /* - } - let reason = status + ' ' + error; - Util.showNotify({title: jqXHR.status + ': System intel data', text: reason, type: 'warning'}); - $(document).setProgramStatus('problem'); */ - }).always(function(){ - // hide loading animation - // this.moduleElement.hideLoadingAnimation(); + console.warn('Fail request systemData!', requestData); }); }; diff --git a/public/js/v1.3.6/app/ui/system_info.js b/public/js/v1.3.6/app/ui/system_info.js index 13a6cf41..ecfbf6a3 100644 --- a/public/js/v1.3.6/app/ui/system_info.js +++ b/public/js/v1.3.6/app/ui/system_info.js @@ -146,7 +146,7 @@ define([ nameRowElement.addCharacterInfoTooltip( tooltipData ); } - moduleElement.hideLoadingAnimation(); + moduleElement.find('.' + config.descriptionArea).hideLoadingAnimation(); }; /** diff --git a/public/js/v1.3.6/app/ui/system_signature.js b/public/js/v1.3.6/app/ui/system_signature.js index d6c52178..0f89fb84 100644 --- a/public/js/v1.3.6/app/ui/system_signature.js +++ b/public/js/v1.3.6/app/ui/system_signature.js @@ -277,7 +277,7 @@ define([ } // set new value - updateCell.data( data ).draw(); + updateCell.data(data).draw(); if(cellIndex === 7){ updateCellElement.initTimestampCounter(); @@ -584,6 +584,8 @@ define([ moduleElement: moduleElement } }).done(function(responseData){ + // unlock table for update + unlockSignatureTable(true); // updates table with new/updated signature information updateSignatureTable(this.moduleElement, responseData.signatures, false); }).fail(function( jqXHR, status, error) {