public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

route params from angular to view store should be updated on routeChangeSuccess

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-02-01 13:28:04 +01:00
parent ee9c408188
commit cdf2fd64b7
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/core/services/bridge_srv.ts
+4 -5
View File
@@ -34,10 +34,7 @@ export class BridgeSrv {
}); });
this.$rootScope.$on('$routeChangeSuccess', (evt, data) => { this.$rootScope.$on('$routeChangeSuccess', (evt, data) => {
let angularUrl = this.$location.url(); store.view.updatePathAndQuery(this.$location.path(), this.$location.search(), this.$route.current.params);
if (store.view.currentUrl !== angularUrl) {
store.view.updatePathAndQuery(this.$location.path(), this.$location.search(), this.$route.current.params);
}
}); });
reaction( reaction(
@@ -45,7 +42,9 @@ export class BridgeSrv {
currentUrl => { currentUrl => {
let angularUrl = this.$location.url(); let angularUrl = this.$location.url();
if (angularUrl !== currentUrl) { if (angularUrl !== currentUrl) {
this.$location.url(currentUrl); this.$timeout(() => {
this.$location.url(currentUrl);
});
console.log('store updating angular $location.url', currentUrl); console.log('store updating angular $location.url', currentUrl);
} }
} }