fix(core): update

This commit is contained in:
Philipp Kunz 2020-02-07 16:32:58 +00:00
parent 3a971301a4
commit 56a8d9182b

View File

@ -87,7 +87,7 @@ export class Objectmap<T> {
/** /**
* get key for object * get key for object
* @param findFunction * @param findFunction
*/ */
public getKeyForObject(objectArg: T) { public getKeyForObject(objectArg: T) {
let foundKey: string = null; let foundKey: string = null;
@ -137,10 +137,14 @@ export class Objectmap<T> {
*/ */
public getOneAndRemove(): T { public getOneAndRemove(): T {
const keys = this.fastMap.getKeys(); const keys = this.fastMap.getKeys();
const keyToUse = keys[keys.length - 1]; if (keys.length === 0) {
const removedItem = this.fastMap.removeFromMap(keyToUse); return null;
this.eventSubject.next('remove'); } else {
return removedItem; const keyToUse = keys[0];
const removedItem = this.fastMap.removeFromMap(keyToUse);
this.eventSubject.next('remove');
return removedItem;
}
} }
/** /**
@ -181,6 +185,5 @@ export class Objectmap<T> {
for (const keyArg of this.fastMap.getKeys()) { for (const keyArg of this.fastMap.getKeys()) {
this.fastMap.removeFromMap(keyArg); this.fastMap.removeFromMap(keyArg);
} }
} }
} }