From f950d2332f5717a513a933c6cb3530de69923413 Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Sat, 21 Mar 2020 23:13:13 +0100 Subject: [PATCH] - fixed hidden select option for "alliance" maps, #930 - fixed tooltips on `/setup` page (webSocket section) --- js/app/map/util.js | 2 +- js/app/setup.js | 10 +++------- public/js/v2.0.0-rc.1/app/map/util.js | 2 +- public/js/v2.0.0-rc.1/app/setup.js | 10 +++------- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/js/app/map/util.js b/js/app/map/util.js index d64e1e9f..42f317d2 100644 --- a/js/app/map/util.js +++ b/js/app/map/util.js @@ -88,7 +88,7 @@ define([ let checkMapTypes = [ {type: 'private', hasRight: false, selector: 'id'}, {type: 'corporation', hasRight: true, selector: 'corporation.id'}, - {type: 'alliance', hasRight: true, selector: 'alliance.id'} + {type: 'alliance', hasRight: false, selector: 'alliance.id'} ]; checkMapTypes.forEach(data => { diff --git a/js/app/setup.js b/js/app/setup.js index 83df971a..a77c00fc 100644 --- a/js/app/setup.js +++ b/js/app/setup.js @@ -167,9 +167,7 @@ define([ }); // tooltips --------------------------------------------------------------------------------------------------- - body.initTooltips({ - container: 'body' - }); + body.initTooltips({container: 'body'}); body.on('show.bs.tooltip', e => { let element = $(e.target); @@ -284,9 +282,7 @@ define([ if(elOld && elNew){ elOld.destroyTooltips(true); elOld.replaceWith(elNew); - elNew.initTooltips({ - container: 'body' - }); + elNew.initTooltips({container: 'body'}); initBarCharts(elNew.find('.' + config.barChartClass)); updateStatusBar(elPanel); } @@ -515,7 +511,7 @@ define([ getWebSocketSubscriptionTable(Util.getObjVal(response, 'load.subStats')).then(payload => { // remove existing table -> then insert new $('#' + config.webSocketStatsId).remove(); - $(payload).insertAfter(webSocketPanel).initTooltips(); + $(payload).insertAfter(webSocketPanel).initTooltips({container: 'body'}); let token = Util.getObjVal(response, 'load.token'); tcpSocketPanel.attr('data-token', token); diff --git a/public/js/v2.0.0-rc.1/app/map/util.js b/public/js/v2.0.0-rc.1/app/map/util.js index d64e1e9f..42f317d2 100644 --- a/public/js/v2.0.0-rc.1/app/map/util.js +++ b/public/js/v2.0.0-rc.1/app/map/util.js @@ -88,7 +88,7 @@ define([ let checkMapTypes = [ {type: 'private', hasRight: false, selector: 'id'}, {type: 'corporation', hasRight: true, selector: 'corporation.id'}, - {type: 'alliance', hasRight: true, selector: 'alliance.id'} + {type: 'alliance', hasRight: false, selector: 'alliance.id'} ]; checkMapTypes.forEach(data => { diff --git a/public/js/v2.0.0-rc.1/app/setup.js b/public/js/v2.0.0-rc.1/app/setup.js index 83df971a..a77c00fc 100644 --- a/public/js/v2.0.0-rc.1/app/setup.js +++ b/public/js/v2.0.0-rc.1/app/setup.js @@ -167,9 +167,7 @@ define([ }); // tooltips --------------------------------------------------------------------------------------------------- - body.initTooltips({ - container: 'body' - }); + body.initTooltips({container: 'body'}); body.on('show.bs.tooltip', e => { let element = $(e.target); @@ -284,9 +282,7 @@ define([ if(elOld && elNew){ elOld.destroyTooltips(true); elOld.replaceWith(elNew); - elNew.initTooltips({ - container: 'body' - }); + elNew.initTooltips({container: 'body'}); initBarCharts(elNew.find('.' + config.barChartClass)); updateStatusBar(elPanel); } @@ -515,7 +511,7 @@ define([ getWebSocketSubscriptionTable(Util.getObjVal(response, 'load.subStats')).then(payload => { // remove existing table -> then insert new $('#' + config.webSocketStatsId).remove(); - $(payload).insertAfter(webSocketPanel).initTooltips(); + $(payload).insertAfter(webSocketPanel).initTooltips({container: 'body'}); let token = Util.getObjVal(response, 'load.token'); tcpSocketPanel.attr('data-token', token);