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

- Fixed "map resize" not working, closed #855

Browse Source
This commit is contained in:
Mark Friedrich
2019-10-31 22:37:40 +01:00
parent 86c05cd741
commit 0c9188634c
6 changed files with 77 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1109,6 +1109,8 @@ define([
width = parseInt(width.substring(0, width.length - 2)) || 0;
height = parseInt(height.substring(0, height.length - 2)) || 0;
mapWrapper.trigger('pf:mapResize');
let promiseStore = MapUtil.getLocaleData('map', mapConfig.config.id );
promiseStore.then((data) => {
let storeData = true;

2
public/css/v1.5.5/pathfinder.css
View File

File diff suppressed because one or more lines are too long

2
public/css/v1.5.5/pathfinder.css.map
View File

File diff suppressed because one or more lines are too long

80
public/js/v1.5.5/app/map/local.js
View File

@@ -7,8 +7,9 @@ define([
'jquery',
'app/init',
'app/util',
'app/map/util'
], function($, Init, Util, MapUtil){
'app/map/util',
'app/map/overlay/util'
], function($, Init, Util, MapUtil, MapOverlayUtil){
'use strict';
let config = {
@@ -93,6 +94,7 @@ define([
let setOverlayObserver = (overlay, mapId) => {
let overlayMain = overlay.find('.' + config.overlayLocalMainClass);
// open/close toggle ------------------------------------------------------------------------------------------
overlayMain.on('click', function(){
let overlayMain = $(this).parent('.' + config.overlayLocalClass);
let isOpenStatus = isOpen(overlayMain);
@@ -108,6 +110,15 @@ define([
}
});
// trigger table re-draw() ------------------------------------------------------------------------------------
let mapWrapper = overlay.parents('.' + MapUtil.config.mapWrapperClass);
mapWrapper.on('pf:mapResize', function(e){
let tableElement = overlay.find('.' + config.overlayLocalTableClass);
let tableApi = tableElement.DataTable();
tableApi.draw('full-hold');
});
// tooltips ---------------------------------------------------------------------------------------------------
overlayMain.initTooltips({
container: 'body',
placement: 'bottom'
@@ -229,7 +240,7 @@ define([
let indexesRemove = filterRows(localTable, 'id', characterAllIds, false);
localTable.rows(indexesRemove).remove();
localTable.draw();
localTable.draw('full-hold');
// update system relevant data in overlay -----------------------------------------------------------------
updateLocaleHeadline(overlay, systemData, characterAllIds.length, characterLocalIds.length);
@@ -339,12 +350,53 @@ define([
overlay.append(overlayMain);
overlay.append(content);
parentElement.append(overlay);
// set observer
setOverlayObserver(overlay, mapId);
parentElement.append(overlay);
// init local table ---------------------------------------------------------------------------------------
table.on('preDraw.dt', function(e, settings){
let table = $(this);
let mapWrapper = table.parents('.' + MapUtil.config.mapWrapperClass);
// mapWrapper should always exist
if(mapWrapper && mapWrapper.length) {
// check available maxHeight for offset based on current map height (resizable)
let mapHeight = mapWrapper[0].offsetHeight;
let localOverlay = MapOverlayUtil.getMapOverlay(table, 'local');
let paginationElement = localOverlay.find('.dataTables_paginate');
let tableApi = table.DataTable();
let pageInfo = tableApi.page.info();
let localTableRowHeight = 26;
let localTop = localOverlay[0].offsetTop;
let bottomSpace = 38 + 10; // "timer" overlay + some spacing top
bottomSpace += 16 + 5 + 5; // horizontal scrollBar height + some spacing top + bottom
let localHeightMax = mapHeight - bottomSpace - localTop; // max available for local overlay
let localTableBodyMaxHeight = localHeightMax - 53; // - headline height + <thead> height
let newPageLength = Math.floor(localTableBodyMaxHeight / localTableRowHeight);
if(pageInfo.recordsDisplay > newPageLength){
// show pagination and limit page length
localTableBodyMaxHeight -= 30; // - pagination height
newPageLength = Math.floor(localTableBodyMaxHeight / localTableRowHeight);
}
if(pageInfo.length !== newPageLength){
tableApi.page.len(newPageLength);
// page length changed -> show/hide pagination
pageInfo = tableApi.page.info();
if(pageInfo.pages <= 1){
paginationElement.hide();
}else{
paginationElement.show();
}
}
}
});
table.on('draw.dt', function(e, settings){
// init table tooltips
@@ -352,15 +404,6 @@ define([
container: 'body',
placement: 'left'
});
// hide pagination in case of only one page
let paginationElement = overlay.find('.dataTables_paginate');
let pageElements = paginationElement.find('span .paginate_button');
if(pageElements.length <= 1){
paginationElement.hide();
}else{
paginationElement.show();
}
});
// table init complete
@@ -373,8 +416,9 @@ define([
});
let localTable = table.DataTable( {
pageLength: 13, // hint: if pagination visible => we need space to show it
pageLength: 5, // hint: if pagination visible => we need space to show it
paging: true,
pagingType: 'simple',
lengthChange: false,
ordering: true,
order: [ 0, 'asc' ],
@@ -386,7 +430,11 @@ define([
return 'pf-local-row_' + rowData.id; // characterId
},
language: {
emptyTable: '<span>You&nbsp;are&nbsp;alone</span>'
emptyTable: '<span>You&nbsp;are&nbsp;alone</span>',
paginate: {
next: '&nbsp;',
previous: '&nbsp;'
}
},
columnDefs: [
{

2
public/js/v1.5.5/app/map/map.js
View File

@@ -1109,6 +1109,8 @@ define([
width = parseInt(width.substring(0, width.length - 2)) || 0;
height = parseInt(height.substring(0, height.length - 2)) || 0;
mapWrapper.trigger('pf:mapResize');
let promiseStore = MapUtil.getLocaleData('map', mapConfig.config.id );
promiseStore.then((data) => {
let storeData = true;

9
sass/layout/_map.scss
View File

@@ -2,7 +2,7 @@ $mapHeight: 1500px;
$mapWidth: 2500px;
$mapWrapperHeight: 520px + 35px;
$mapWrapperMinHeight: 250px;
$mapWrapperMinHeight: 300px;
$mapWrapperMaxHeight: 1000px; // no vertical scrollbar: $mapHeight + 35px;
$mapWrapperMaxWidth: $mapWidth + 35px;
@@ -49,7 +49,7 @@ $mapBubbleWidth: 30px;
max-width: $mapWrapperMaxWidth;
max-height: $mapWrapperMaxHeight;
min-height: $mapWrapperMinHeight;
overflow: auto;
overflow: hidden; // required for resizing to work with pos: absolute "overlay" elements
padding: 5px;
background: rgba($gray-darker, 0.93);
box-shadow:inset -3px 3px 10px 0 rgba($black, 0.3);
@@ -207,6 +207,10 @@ $mapBubbleWidth: 30px;
.pf-local-table {
font-size: 10px;
&.no-footer{
border-bottom: 1px solid transparent; // overwrite default
}
td {
white-space: nowrap;
}
@@ -215,6 +219,7 @@ $mapBubbleWidth: 30px;
.dataTables_paginate,
.dataTables_empty{
white-space: nowrap;
padding-top: 3px; // overwrite default
}
.pf-map-overlay-toolbar{