@web-atoms/core 2.2.8 → 2.2.10

package/dist/xf/services/XFBusyIndicatorService.js

@@ -1,2 +1,31 @@
-System.register(["tslib","../../core/AtomBridge","../../di/RegisterSingleton","../../services/BusyIndicatorService"],function(_export,_context){"use strict";var __decorate,AtomBridge,RegisterSingleton,BusyIndicatorService,XFBusyIndicatorService;return{setters:[function(_tslib){__decorate=_tslib.__decorate;},function(_coreAtomBridge){AtomBridge=_coreAtomBridge.AtomBridge;},function(_diRegisterSingleton){RegisterSingleton=_diRegisterSingleton.RegisterSingleton;},function(_servicesBusyIndicatorService){BusyIndicatorService=_servicesBusyIndicatorService.BusyIndicatorService;}],execute:function(){XFBusyIndicatorService=class XFBusyIndicatorService extends BusyIndicatorService{createIndicator(){const popup=AtomBridge.instance.createBusyIndicator();return{dispose:()=>{popup.dispose();}};}};XFBusyIndicatorService=__decorate([RegisterSingleton],XFBusyIndicatorService);_export("default",XFBusyIndicatorService);}};});
+System.register(["tslib", "../../core/AtomBridge", "../../di/RegisterSingleton", "../../services/BusyIndicatorService"], function (_export, _context) {
+  "use strict";
+
+  var __decorate, AtomBridge, RegisterSingleton, BusyIndicatorService, XFBusyIndicatorService;
+  return {
+    setters: [function (_tslib) {
+      __decorate = _tslib.__decorate;
+    }, function (_coreAtomBridge) {
+      AtomBridge = _coreAtomBridge.AtomBridge;
+    }, function (_diRegisterSingleton) {
+      RegisterSingleton = _diRegisterSingleton.RegisterSingleton;
+    }, function (_servicesBusyIndicatorService) {
+      BusyIndicatorService = _servicesBusyIndicatorService.BusyIndicatorService;
+    }],
+    execute: function () {
+      XFBusyIndicatorService = class XFBusyIndicatorService extends BusyIndicatorService {
+        createIndicator() {
+          const popup = AtomBridge.instance.createBusyIndicator();
+          return {
+            dispose: () => {
+              popup.dispose();
+            }
+          };
+        }
+      };
+      XFBusyIndicatorService = __decorate([RegisterSingleton], XFBusyIndicatorService);
+      _export("default", XFBusyIndicatorService);
+    }
+  };
+});
 //# sourceMappingURL=XFBusyIndicatorService.js.map

package/dist/xf/services/XFBusyIndicatorService.js.map

@@ -1 +1 @@
-{"version":3,"mappings":"+UAASA,UAAU,iBAAVA,UAAU,kCAEVC,iBAAiB,sBAAjBA,iBAAiB,2CACjBC,oBAAoB,+BAApBA,oBAAoB,uBAGRC,sBAAsB,CAA5B,KAAMA,uBAAuB,QAAQD,qBAAoB,CAE7DE,eAAe,GAClB,KAAMC,MAAK,CAAGL,UAAU,CAACM,QAAQ,CAACC,mBAAmB,EAAE,CACvD,MAAO,CACHC,OAAO,CAAE,IAAK,CACVH,KAAK,CAACG,OAAO,EAAE,CACnB,EACH,CACL,EAEH,CAXoBL,sBAAsB,aAD1CF,iBAAiB,EACGE,sBAAsB,CAW1C,mBAXoBA,sBAAsB","names":["AtomBridge","RegisterSingleton","BusyIndicatorService","XFBusyIndicatorService","createIndicator","popup","instance","createBusyIndicator","dispose"],"sourceRoot":"","sources":["../../../src/xf/services/XFBusyIndicatorService.ts"],"sourcesContent":[null]}
+{"version":3,"mappings":";;;;;;;;MAASA,UAAU,mBAAVA,UAAU;IAAA;MAEVC,iBAAiB,wBAAjBA,iBAAiB;IAAA;MACjBC,oBAAoB,iCAApBA,oBAAoB;IAAA;IAAA;MAGRC,sBAAsB,GAA5B,MAAMA,sBAAuB,SAAQD,oBAAoB;QAE7DE,eAAe;UAClB,MAAMC,KAAK,GAAGL,UAAU,CAACM,QAAQ,CAACC,mBAAmB,EAAE;UACvD,OAAO;YACHC,OAAO,EAAE,MAAK;cACVH,KAAK,CAACG,OAAO,EAAE;YACnB;WACH;QACL;OAEH;MAXoBL,sBAAsB,eAD1CF,iBAAiB,GACGE,sBAAsB,CAW1C;MAAA,mBAXoBA,sBAAsB;IAAA;EAAA;AAAA","names":["AtomBridge","RegisterSingleton","BusyIndicatorService","XFBusyIndicatorService","createIndicator","popup","instance","createBusyIndicator","dispose"],"sourceRoot":"","sources":["../../../src/xf/services/XFBusyIndicatorService.ts"],"sourcesContent":[null]}

package/dist/xf/services/XFNavigationService.js

@@ -1,2 +1,139 @@
-System.register(["tslib","../../App","../../core/AtomBridge","../../core/AtomLoader","../../core/AtomUri","../../di/Inject","../../di/RegisterSingleton","../../services/JsonService","../../services/NavigationService","../../view-model/AtomWindowViewModel"],function(_export,_context){"use strict";var __awaiter,__decorate,__metadata,__param,App,AtomBridge,AtomLoader,AtomUri,Inject,RegisterSingleton,JsonService,NavigationService,AtomWindowViewModel,XFNavigationService;return{setters:[function(_tslib){__awaiter=_tslib.__awaiter;__decorate=_tslib.__decorate;__metadata=_tslib.__metadata;__param=_tslib.__param;},function(_App){App=_App.App;},function(_coreAtomBridge){AtomBridge=_coreAtomBridge.AtomBridge;},function(_coreAtomLoader){AtomLoader=_coreAtomLoader.AtomLoader;},function(_coreAtomUri){AtomUri=_coreAtomUri.AtomUri;},function(_diInject){Inject=_diInject.Inject;},function(_diRegisterSingleton){RegisterSingleton=_diRegisterSingleton.RegisterSingleton;},function(_servicesJsonService){JsonService=_servicesJsonService.JsonService;},function(_servicesNavigationService){NavigationService=_servicesNavigationService.NavigationService;},function(_viewModelAtomWindowViewModel){AtomWindowViewModel=_viewModelAtomWindowViewModel.AtomWindowViewModel;}],execute:function(){XFNavigationService=class XFNavigationService extends NavigationService{get title(){return undefined;}set title(v){}get location(){return new AtomUri(bridge.navigationService.getLocation());}set location(v){bridge.navigationService.setLocation(v.toString());}constructor(app,jsonService){super(app);this.jsonService=jsonService;this.stack=[];}alert(message,title){if(typeof message!=="string"){message=message.toString();}return new Promise((resolve,reject)=>{bridge.alert(message,title,()=>{resolve();},f=>{reject(f);});});}confirm(message,title){return new Promise((resolve,reject)=>{bridge.confirm(message,title,r=>{resolve(r);},f=>{reject(f);});});}notify(message,title,type,delay){return __awaiter(this,void 0,void 0,function*(){console.warn("Display toast not yet implemented");});}navigate(url){const uri=new AtomUri(url);this.stack.push(url);this.app.runAsync(()=>__awaiter(this,void 0,void 0,function*(){const{view:popup}=yield AtomLoader.loadView(uri,this.app,true);bridge.setRoot(popup.element);}));}back(){if(this.stack.length){const url=this.stack.pop();this.app.runAsync(()=>__awaiter(this,void 0,void 0,function*(){const uri=new AtomUri(url);const{view:popup}=yield AtomLoader.loadView(uri,this.app,true);bridge.setRoot(popup.element);}));}}refresh(){AtomBridge.instance.reset();}openWindow(url,options){return __awaiter(this,void 0,void 0,function*(){const{view:popup,disposables,returnPromise,id}=yield AtomLoader.loadView(url,this.app,true,()=>this.app.resolve(AtomWindowViewModel,true));if(options&&options.onInit){options.onInit(popup);}const cancelToken=options.cancelToken;if(cancelToken){if(cancelToken.cancelled){this.app.callLater(()=>{this.remove(popup,true);});}cancelToken.registerForCancel(()=>{this.remove(popup,true);});}const ve=popup.element;AtomBridge.instance.setValue(ve,"name",id);bridge.pushPage(ve,options||{},()=>{},e=>{this.remove(popup,true);});disposables.add(()=>{AtomBridge.instance.popPage(ve,()=>{},e=>{console.error(e);});});return returnPromise;});}};XFNavigationService=__decorate([RegisterSingleton,__param(0,Inject),__param(1,Inject),__metadata("design:paramtypes",[App,JsonService])],XFNavigationService);_export("default",XFNavigationService);}};});
+System.register(["tslib", "../../App", "../../core/AtomBridge", "../../core/AtomLoader", "../../core/AtomUri", "../../di/Inject", "../../di/RegisterSingleton", "../../services/JsonService", "../../services/NavigationService", "../../view-model/AtomWindowViewModel"], function (_export, _context) {
+  "use strict";
+
+  var __awaiter, __decorate, __metadata, __param, App, AtomBridge, AtomLoader, AtomUri, Inject, RegisterSingleton, JsonService, NavigationService, AtomWindowViewModel, XFNavigationService;
+  return {
+    setters: [function (_tslib) {
+      __awaiter = _tslib.__awaiter;
+      __decorate = _tslib.__decorate;
+      __metadata = _tslib.__metadata;
+      __param = _tslib.__param;
+    }, function (_App) {
+      App = _App.App;
+    }, function (_coreAtomBridge) {
+      AtomBridge = _coreAtomBridge.AtomBridge;
+    }, function (_coreAtomLoader) {
+      AtomLoader = _coreAtomLoader.AtomLoader;
+    }, function (_coreAtomUri) {
+      AtomUri = _coreAtomUri.AtomUri;
+    }, function (_diInject) {
+      Inject = _diInject.Inject;
+    }, function (_diRegisterSingleton) {
+      RegisterSingleton = _diRegisterSingleton.RegisterSingleton;
+    }, function (_servicesJsonService) {
+      JsonService = _servicesJsonService.JsonService;
+    }, function (_servicesNavigationService) {
+      NavigationService = _servicesNavigationService.NavigationService;
+    }, function (_viewModelAtomWindowViewModel) {
+      AtomWindowViewModel = _viewModelAtomWindowViewModel.AtomWindowViewModel;
+    }],
+    execute: function () {
+      XFNavigationService = class XFNavigationService extends NavigationService {
+        get title() {
+          return undefined;
+        }
+        set title(v) {}
+        get location() {
+          return new AtomUri(bridge.navigationService.getLocation());
+        }
+        set location(v) {
+          bridge.navigationService.setLocation(v.toString());
+        }
+        constructor(app, jsonService) {
+          super(app);
+          this.jsonService = jsonService;
+          this.stack = [];
+        }
+        alert(message, title) {
+          if (typeof message !== "string") {
+            message = message.toString();
+          }
+          return new Promise((resolve, reject) => {
+            bridge.alert(message, title, () => {
+              resolve();
+            }, f => {
+              reject(f);
+            });
+          });
+        }
+        confirm(message, title) {
+          return new Promise((resolve, reject) => {
+            bridge.confirm(message, title, r => {
+              resolve(r);
+            }, f => {
+              reject(f);
+            });
+          });
+        }
+        notify(message, title, type, delay) {
+          return __awaiter(this, void 0, void 0, function* () {
+            console.warn("Display toast not yet implemented");
+          });
+        }
+        navigate(url) {
+          const uri = new AtomUri(url);
+          this.stack.push(url);
+          this.app.runAsync(() => __awaiter(this, void 0, void 0, function* () {
+            const {
+              view: popup
+            } = yield AtomLoader.loadView(uri, this.app, true);
+            bridge.setRoot(popup.element);
+          }));
+        }
+        back() {
+          if (this.stack.length) {
+            const url = this.stack.pop();
+            this.app.runAsync(() => __awaiter(this, void 0, void 0, function* () {
+              const uri = new AtomUri(url);
+              const {
+                view: popup
+              } = yield AtomLoader.loadView(uri, this.app, true);
+              bridge.setRoot(popup.element);
+            }));
+          }
+        }
+        refresh() {
+          AtomBridge.instance.reset();
+        }
+        openWindow(url, options) {
+          return __awaiter(this, void 0, void 0, function* () {
+            const {
+              view: popup,
+              disposables,
+              returnPromise,
+              id
+            } = yield AtomLoader.loadView(url, this.app, true, () => this.app.resolve(AtomWindowViewModel, true));
+            if (options && options.onInit) {
+              options.onInit(popup);
+            }
+            const cancelToken = options.cancelToken;
+            if (cancelToken) {
+              if (cancelToken.cancelled) {
+                this.app.callLater(() => {
+                  this.remove(popup, true);
+                });
+              }
+              cancelToken.registerForCancel(() => {
+                this.remove(popup, true);
+              });
+            }
+            const ve = popup.element;
+            AtomBridge.instance.setValue(ve, "name", id);
+            bridge.pushPage(ve, options || {}, () => {}, e => {
+              this.remove(popup, true);
+            });
+            disposables.add(() => {
+              AtomBridge.instance.popPage(ve, () => {}, e => {
+                console.error(e);
+              });
+            });
+            return returnPromise;
+          });
+        }
+      };
+      XFNavigationService = __decorate([RegisterSingleton, __param(0, Inject), __param(1, Inject), __metadata("design:paramtypes", [App, JsonService])], XFNavigationService);
+      _export("default", XFNavigationService);
+    }
+  };
+});
 //# sourceMappingURL=XFNavigationService.js.map

package/dist/xf/services/XFNavigationService.js.map

@@ -1 +1 @@
-{"version":3,"mappings":"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","names":["App","AtomBridge","AtomLoader","AtomUri","Inject","RegisterSingleton","JsonService","NavigationService","AtomWindowViewModel","XFNavigationService","title","undefined","v","location","bridge","navigationService","getLocation","setLocation","toString","constructor","app","jsonService","alert","message","Promise","resolve","reject","f","confirm","r","notify","type","delay","console","warn","navigate","url","uri","stack","push","runAsync","__awaiter","view","popup","loadView","setRoot","element","back","length","pop","refresh","instance","reset","openWindow","options","disposables","returnPromise","id","onInit","cancelToken","cancelled","callLater","remove","registerForCancel","ve","setValue","pushPage","e","add","popPage","error","__param"],"sourceRoot":"","sources":["../../../src/xf/services/XFNavigationService.ts"],"sourcesContent":[null]}
+{"version":3,"mappings":"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","names":["App","AtomBridge","AtomLoader","AtomUri","Inject","RegisterSingleton","JsonService","NavigationService","AtomWindowViewModel","XFNavigationService","title","undefined","v","location","bridge","navigationService","getLocation","setLocation","toString","constructor","app","jsonService","alert","message","Promise","resolve","reject","f","confirm","r","notify","type","delay","console","warn","navigate","url","uri","stack","push","runAsync","__awaiter","view","popup","loadView","setRoot","element","back","length","pop","refresh","instance","reset","openWindow","options","disposables","returnPromise","id","onInit","cancelToken","cancelled","callLater","remove","registerForCancel","ve","setValue","pushPage","e","add","popPage","error","__param"],"sourceRoot":"","sources":["../../../src/xf/services/XFNavigationService.ts"],"sourcesContent":[null]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web-atoms/core",
-  "version": "2.2.8",
+  "version": "2.2.10",
   "description": "Web Atoms Core",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,7 @@
   "homepage": "https://github.com/neurospeech/web-atoms-core#readme",
   "devDependencies": {
     "@web-atoms/module-loader": "^2.0.6",
-    "@web-atoms/ts-to-systemjs": "^1.1.6",
+    "@web-atoms/ts-to-systemjs": "^1.1.7",
     "@web-atoms/unit-test": "^1.0.32",
     "colors": "^1.4.0",
     "istanbul": "^0.4.5",

package/src/web/services/PopupService.tsx

@@ -539,29 +539,7 @@ export class ConfirmPopup extends PopupWindow {
         noLabel = "No",
         cancelLabel = null
     }): Promise<boolean> {
-        try {
-            const popup = class extends ConfirmPopup {
-                protected create(): void {
-                    this.render(<div>
-                        { message instanceof XNode ? message : <div text={message}/> }
-                    </div>);
-                }
-            };
-            return await popup.showModal<boolean>({
-                parameters: {
-                    message,
-                    yesLabel,
-                    noLabel,
-                    cancelLabel
-                },
-                title
-            });
-        } catch (e) {
-            if (CancelToken.isCancelled(e)) {
-                return false;
-            }
-            throw e;
-        }
+        return PopupService.confirm({ title, message, yesLabel, noLabel,  cancelLabel});
     }
 
     public message: string;