From 514095da7ad4f8144b2bac784604a2f0d0d448b1 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 6 Oct 2020 18:04:34 +0200 Subject: [PATCH] move waitFor and get to BaseObservableValue --- src/observable/ObservableValue.js | 19 +++++++++++-------- src/ui/web/dom/OnlineStatus.js | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/observable/ObservableValue.js b/src/observable/ObservableValue.js index f1786dbd..3fbfe463 100644 --- a/src/observable/ObservableValue.js +++ b/src/observable/ObservableValue.js @@ -25,6 +25,17 @@ export class BaseObservableValue extends BaseObservable { } } + get() { + throw new Error("unimplemented"); + } + + waitFor(predicate) { + if (predicate(this.get())) { + return new ResolvedWaitForHandle(Promise.resolve(this.get())); + } else { + return new WaitForHandle(this, predicate); + } + } } class WaitForHandle { @@ -81,14 +92,6 @@ export class ObservableValue extends BaseObservableValue { this.emit(this._value); } } - - waitFor(predicate) { - if (predicate(this.get())) { - return new ResolvedWaitForHandle(Promise.resolve(this.get())); - } else { - return new WaitForHandle(this, predicate); - } - } } export function tests() { diff --git a/src/ui/web/dom/OnlineStatus.js b/src/ui/web/dom/OnlineStatus.js index e1d7843a..588c0815 100644 --- a/src/ui/web/dom/OnlineStatus.js +++ b/src/ui/web/dom/OnlineStatus.js @@ -31,7 +31,7 @@ export class OnlineStatus extends BaseObservableValue { this.emit(true); } - get value() { + get() { return navigator.onLine; }