implab/implabjs-core Commit - r150:b16ed1178612

Fixed circular dependency safe<->Cancellation

cin -

r150:b16ed1178612 v1.4.0-rc7 default

parent child

Context file:

r150:b16ed1178612

src/main/ts/safe.ts +19 -3

-            import { ICancellable, Constructor, IDestroyable, PromiseOrValue } from "./interfaces";
+            import { ICancellable, Constructor, IDestroyable, ICancellation } from "./interfaces";
-            import { Cancellation } from "./Cancellation";
             let _nextOid = 0;
             const _oid = typeof Symbol === "function" ?
                     return (instance[_oid] = "oid_" + (++_nextOid));
             }
+            const cancellationNone: ICancellation = {
+                isSupported(): boolean {
+                    return false;
+                },
+                throwIfRequested(): void {
+                },
+                isRequested(): boolean {
+                    return false;
+                },
+                register(_cb: (e: any) => void): IDestroyable {
+                    return destroyed;
+                }
+            };
             export function keys<T>(arg: T): (Extract<keyof T, string>)[] {
                 return isObject(arg) && arg ? Object.keys(arg) as (Extract<keyof T, string>)[] : [];
             }
                 };
             }
-            export function delay(timeMs: number, ct = Cancellation.none) {
+            export function delay(timeMs: number, ct = cancellationNone) {
                 ct.throwIfRequested();
                 return new Promise((resolve, reject) => {
                     const h = ct.register(e => {

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages