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

- Replaced som JS ES5 code with polyfills (current 'production' build does not support "object destruction"

Browse Source
This commit is contained in:
Mark Friedrich
2019-12-02 19:47:59 +01:00
parent 2c501d4692
commit 2f7807f326
6 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/controller/ccp/sso.php
View File

@@ -468,7 +468,7 @@ class Sso extends Api\User{
*/
$corporation = Pathfinder\AbstractPathfinderModel::getNew('CorporationModel');
$corporation->getById($corporationId, 0);
if( !$corporation->dry() ){
if($corporation->valid()){
$characterData->corporation = $corporation;
}
}
@@ -479,7 +479,7 @@ class Sso extends Api\User{
*/
$alliance = Pathfinder\AbstractPathfinderModel::getNew('AllianceModel');
$alliance->getById($allianceId, 0);
if( !$alliance->dry() ){
if($alliance->valid()){
$characterData->alliance = $alliance;
}
}

2
app/main/model/abstractmodel.php
View File

@@ -930,7 +930,7 @@ abstract class AbstractModel extends Cortex {
*/
protected function isOutdated() : bool {
$outdated = true;
if(!$this->dry()){
if($this->valid()){
try{
$timezone = $this->getF3()->get('getTimeZone')();
$currentTime = new \DateTime('now', $timezone);

9
js/app/lib/dragSelect.js
View File

@@ -356,7 +356,14 @@ define(['app/lib/eventHandler'], (EventHandler) => {
}
filterDomRect(domRect, filteredKeys = ['left', 'top', 'width', 'height']){
return filteredKeys.reduce((obj, key) => ({ ...obj, [key]: domRect[key] }), {});
let obj = {};
filteredKeys.forEach(key => {
if(domRect[key] !== undefined){
obj[key] = domRect[key];
}
});
return obj;
//return filteredKeys.reduce((obj, key) => ({ ...obj, [key]: domRect[key] }), {}); // same result but uses "object destruction" ES5
}
callback(callback, ...args){

2
js/app/util.js
View File

@@ -3321,7 +3321,7 @@ define([
let objCombine = (...objects) => {
let combined = objects.reduce((acc, obj) => acc.concatFilter(Object.values(obj)), []);
combined.unshift(''); // properties should start at 1 (not 0)
combined = {...combined};
combined = Object.assign({}, combined);
delete combined[0];
return combined;
};

9
public/js/v1.5.5/app/lib/dragSelect.js
View File

@@ -356,7 +356,14 @@ define(['app/lib/eventHandler'], (EventHandler) => {
}
filterDomRect(domRect, filteredKeys = ['left', 'top', 'width', 'height']){
return filteredKeys.reduce((obj, key) => ({ ...obj, [key]: domRect[key] }), {});
let obj = {};
filteredKeys.forEach(key => {
if(domRect[key] !== undefined){
obj[key] = domRect[key];
}
});
return obj;
//return filteredKeys.reduce((obj, key) => ({ ...obj, [key]: domRect[key] }), {}); // same result but uses "object destruction" ES5
}
callback(callback, ...args){

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

@@ -3321,7 +3321,7 @@ define([
let objCombine = (...objects) => {
let combined = objects.reduce((acc, obj) => acc.concatFilter(Object.values(obj)), []);
combined.unshift(''); // properties should start at 1 (not 0)
combined = {...combined};
combined = Object.assign({}, combined);
delete combined[0];
return combined;
};