diff options
| author |   Idan Amit <ia096e@intl.att.com> | 2018-03-13 19:59:46 +0200 |
|---|---|---|
| committer | Idan Amit <ia096e@intl.att.com> | 2018-03-13 20:02:12 +0200 |
| commit | fad1d735d7ac3896e28277c733920d15e105db6e (patch) | |
| tree | 22dabd78b1383707776fc06ccd1c8b5814461131 /catalog-ui/src/app/ng2/components/ui | |
| parent | 0f3a80869bf57fc909ec5908601ba04271d92d97 (diff) | |
Fixed merge issues
Fixed merge issues that broke the behavior of the plugins development
Change-Id: I6333944939628f745eb36c4619be33780881d27d
Issue-ID: SDC-1126
Signed-off-by: Idan Amit <ia096e@intl.att.com>
Diffstat (limited to 'catalog-ui/src/app/ng2/components/ui')
| -rw-r--r-- | catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.ts | 2 |
1 files changed, 1 insertions, 1 deletions
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 eb7d138232..fc0af53a44 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 @@ -48,7 +48,7 @@ export class PluginFrameComponent implements OnInit { // Listening to the stateChangeStart event in order to notify the plugin about it being closed // before moving to a new state this.$scope.$on('$stateChangeStart', (event, toState, toParams, fromState, fromParams) => { - if (fromState.name !== toState.name) { + if ((fromState.name !== toState.name) || (fromState.name === toState.name) && (toParams.path !== fromParams.path)) { if (!this.isClosed) { event.preventDefault(); |