From 2f7807f326e192f5764effa156f0555e63f80dcc Mon Sep 17 00:00:00 2001
From: Mark Friedrich <exodus4d@users.noreply.github.com>
Date: Mon, 2 Dec 2019 19:47:59 +0100
Subject: [PATCH] - Replaced som JS ES5 code with polyfills (current
 'production' build does not support "object destruction"

---
 app/main/controller/ccp/sso.php        | 4 ++--
 app/main/model/abstractmodel.php       | 2 +-
 js/app/lib/dragSelect.js               | 9 ++++++++-
 js/app/util.js                         | 2 +-
 public/js/v1.5.5/app/lib/dragSelect.js | 9 ++++++++-
 public/js/v1.5.5/app/util.js           | 2 +-
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/main/controller/ccp/sso.php b/app/main/controller/ccp/sso.php
index 914ea340..2b51cdb8 100644
--- a/app/main/controller/ccp/sso.php
+++ b/app/main/controller/ccp/sso.php
@@ -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;
                     }
                 }
diff --git a/app/main/model/abstractmodel.php b/app/main/model/abstractmodel.php
index 4be45b34..42411ede 100644
--- a/app/main/model/abstractmodel.php
+++ b/app/main/model/abstractmodel.php
@@ -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);
diff --git a/js/app/lib/dragSelect.js b/js/app/lib/dragSelect.js
index b6021207..f47a165b 100644
--- a/js/app/lib/dragSelect.js
+++ b/js/app/lib/dragSelect.js
@@ -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){
diff --git a/js/app/util.js b/js/app/util.js
index f7f56346..c7c7c0b6 100644
--- a/js/app/util.js
+++ b/js/app/util.js
@@ -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;
     };
diff --git a/public/js/v1.5.5/app/lib/dragSelect.js b/public/js/v1.5.5/app/lib/dragSelect.js
index b6021207..f47a165b 100644
--- a/public/js/v1.5.5/app/lib/dragSelect.js
+++ b/public/js/v1.5.5/app/lib/dragSelect.js
@@ -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){
diff --git a/public/js/v1.5.5/app/util.js b/public/js/v1.5.5/app/util.js
index f7f56346..c7c7c0b6 100644
--- a/public/js/v1.5.5/app/util.js
+++ b/public/js/v1.5.5/app/util.js
@@ -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;
     };