dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed hidden select option for "alliance" maps, #930

Browse Source 
- fixed tooltips on `/setup` page (webSocket section)
This commit is contained in:
Mark Friedrich
2020-03-21 23:13:13 +01:00
parent 4bcee51dc9
commit f950d2332f
4 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/app/map/util.js
View File

@@ -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 => {

10
js/app/setup.js
View File

@@ -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);

2
public/js/v2.0.0-rc.1/app/map/util.js
View File

@@ -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 => {

10
public/js/v2.0.0-rc.1/app/setup.js
View File

@@ -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);