From 60c47df2499a98a1d0bd54ef4feb3316ae738e05 Mon Sep 17 00:00:00 2001 From: Idan Amit Date: Tue, 8 May 2018 16:06:34 +0300 Subject: Developed disable navigation mechanism Added a list for events to not fire an WINDOW_OUT event after sdc notifies about them Small fix to Plugins loader Change-Id: Ia31ebf4095b94a5ca602c4f502df4fcc32368b0b Issue-ID: SDC-1277 Signed-off-by: Idan Amit --- .../components/ui/plugin/plugin-frame.component.ts | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'catalog-ui/src/app/ng2/components/ui') diff --git a/catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.ts b/catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.ts index 83d302b2a8..cd92cca2f7 100644 --- a/catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.ts +++ b/catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.ts @@ -58,15 +58,20 @@ export class PluginFrameComponent implements OnInit { // before moving to a new state this.$scope.$on('$stateChangeStart', (event, toState, toParams, fromState, fromParams) => { if ((fromState.name !== toState.name) || (fromState.name === toState.name) && (toParams.path !== fromParams.path)) { - if (!this.isClosed) { - event.preventDefault(); + if(this.eventBusService.NoWindowOutEvents.indexOf(this.eventBusService.lastEventNotified) == -1) { + if (!this.isClosed) { + event.preventDefault(); - this.eventBusService.notify("WINDOW_OUT").subscribe(() => { - this.isClosed = true; - this.eventBusService.unregister(this.plugin.pluginId); + this.eventBusService.notify("WINDOW_OUT").subscribe(() => { + this.isClosed = true; + this.eventBusService.unregister(this.plugin.pluginId); - this.$state.go(toState.name, toParams); - }); + this.$state.go(toState.name, toParams); + }); + } + } + else { + this.eventBusService.unregister(this.plugin.pluginId); } } }); -- cgit 1.2.3-korg