tamius-han/ultrawidify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change some variable names for readability

Browse Source
This commit is contained in:
Tamius Han 2019-10-20 21:11:09 +02:00
parent 7a9c341bf8
commit 85fa314bb4
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/ext/lib/ObjectCopy.js
View File

@ -1,12 +1,12 @@
import Debug from '../conf/Debug'; import Debug from '../conf/Debug';
class ObjectCopy { class ObjectCopy {
static addNew(existing, target){ static addNew(current, newValues){
// clone target // clone target
var out = JSON.parse(JSON.stringify(target)); var out = JSON.parse(JSON.stringify(newValues));
if(! existing) { if(! current) {
if(Debug.debug) { if(Debug.debug) {
console.log("[ObjectCopy::addNew] There's no existing value. Returning target value."); console.log("[ObjectCopy::addNew] There's no existing value. Returning target value.");
} }
@ -16,10 +16,10 @@ class ObjectCopy {
for(var k in out) { for(var k in out) {
// if current key exist, replace it with existing value. Take no action otherwise. // if current key exist, replace it with existing value. Take no action otherwise.
if(existing[k]) { if(current[k]) {
// Types and constructors of objects must match. If they don't, we always use the new value. // Types and constructors of objects must match. If they don't, we always use the new value.
if(typeof out[k] === typeof existing[k] && out[k].constructor === existing[k].constructor) { if(typeof out[k] === typeof current[k] && out[k].constructor === current[k].constructor) {
// objects are special, we need to check them recursively. // objects are special, we need to check them recursively.
if(out[k] && typeof out[k] === 'object' && out[k].constructor === Object ) { if(out[k] && typeof out[k] === 'object' && out[k].constructor === Object ) {
@ -27,9 +27,9 @@ class ObjectCopy {
console.log("[ObjectCopy::addNew] current key contains an object. Recursing!") console.log("[ObjectCopy::addNew] current key contains an object. Recursing!")
} }
out[k] = this.addNew(existing[k], out[k]); out[k] = this.addNew(current[k], out[k]);
} else { } else {
out[k] = existing[k]; out[k] = current[k];
} }
} }
} }
@ -37,39 +37,41 @@ class ObjectCopy {
// add the values that would otherwise be deleted back to our object. (We need that so user-defined // add the values that would otherwise be deleted back to our object. (We need that so user-defined
// sites don't get forgotten) // sites don't get forgotten)
for(var k in existing) { for(var k in current) {
if (! out[k]) { if (! out[k]) {
out[k] = existing[k]; out[k] = current[k];
} }
} }
return out; return out;
} }
static overwrite(existing, target){ static overwrite(current, newValues){
for(var k in target) { for(var k in newValues) {
// if current key exist, replace it with existing value. Take no action otherwise. // if current key exist, replace it with existing value. Take no action otherwise.
if (existing[k]) { if (current[k] !== undefined) {
// Types and constructors of objects must match. If they don't, we always use the new value. // Types and constructors of objects must match. If they don't, we always use the new value.
if (typeof target[k] === typeof existing[k] && target[k].constructor === existing[k].constructor) { if (typeof newValues[k] === typeof current[k] && newValues[k].constructor === current[k].constructor) {
// objects are special, we need to check them recursively. // objects are special, we need to check them recursively.
if(existing[k] && typeof existing[k] === 'object' && existing[k].constructor === Object ) { if(current[k] && typeof current[k] === 'object' && current[k].constructor === Object ) {
if(Debug.debug && Debug.settings) { if(Debug.debug && Debug.settings) {
console.log("[ObjectCopy::addNew] current key contains an object. Recursing!") console.log("[ObjectCopy::addNew] current key contains an object. Recursing!")
} }
existing[k] = this.overwrite(existing[k], target[k]); current[k] = this.overwrite(current[k], newValues[k]);
} else { } else {
existing[k] = target[k]; current[k] = newValues[k];
} }
} else { } else {
existing[k] = target[k]; current[k] = newValues[k];
} }
} }
else if (newValues[k] !== undefined) {
current[k] = newValues[k];
} }
return existing; }
return current;
} }
static pruneUnused(existing, target, ignoreKeys) { static pruneUnused(existing, target, ignoreKeys) {

1
src/ext/lib/Settings.js
View File

@ -158,7 +158,6 @@ class Settings {
while (index < patches.length) { while (index < patches.length) {
delete patches[index].forVersion; delete patches[index].forVersion;
ObjectCopy.overwrite(this.active, patches[index]); ObjectCopy.overwrite(this.active, patches[index]);
index++; index++;
} }
} }