@mtgame/core 0.1.59 → 0.1.61

package/bundles/mtgame-core.umd.js

@@ -9935,19 +9935,23 @@
     }(StorageEngine));
 
     function componentDestroyed(component) {
-        if (component.constructor.__componentDestroyed$) {
-            return component.constructor.__componentDestroyed$;
+        if (!component.__decoratorApplied) {
+            throw new Error('Use @UntilDestroy decorator in class');
         }
-        throw new Error('Use @UntilDestroy decorator in class');
+        if (!component.__componentDestroyed$) {
+            component.__componentDestroyed$ = new Subject.Subject();
+        }
+        return component.__componentDestroyed$;
     }
     function UntilDestroy(cmpType) {
-        var def = getDef(cmpType);
-        var original = def.onDestroy;
-        cmpType.__componentDestroyed$ = new Subject.Subject();
-        def.onDestroy = function () {
-            cmpType.__componentDestroyed$.next();
-            cmpType.__componentDestroyed$.complete();
-            original.apply(this);
+        var original = cmpType.prototype.ngOnDestroy;
+        cmpType.prototype.__componentDestroyed$ = new Subject.Subject();
+        cmpType.prototype.__decoratorApplied = true;
+        cmpType.prototype.ngOnDestroy = function () {
+            this.__componentDestroyed$.next();
+            this.__componentDestroyed$.complete();
+            delete this.__componentDestroyed$;
+            original.call(this);
         };
     }
     function getDef(type) {