From 747cadc462b1db1420e3cc0bc25431895384dbb2 Mon Sep 17 00:00:00 2001 From: Jade McGough Date: Fri, 31 Mar 2017 11:30:29 -0700 Subject: [PATCH 1/4] exit presentation mode when path changes --- ui/src/index.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/src/index.js b/ui/src/index.js index 2eb1d14d9f..ac83f5bff0 100644 --- a/ui/src/index.js +++ b/ui/src/index.js @@ -28,6 +28,8 @@ import 'src/style/chronograf.scss' const store = configureStore(loadLocalStorage()) const rootNode = document.getElementById('react-root') +// c + let browserHistory const basepath = rootNode.dataset.basepath window.basepath = basepath @@ -40,6 +42,9 @@ if (basepath) { basename: "", }) } +browserHistory.listen(_ => { + store.dispatch(disablePresentationMode()) +}) window.addEventListener('keyup', (event) => { if (event.key === 'Escape') { From 4d5c1b5787c9953adf343aec0d13381ae3c31bf0 Mon Sep 17 00:00:00 2001 From: Jade McGough Date: Fri, 31 Mar 2017 11:33:18 -0700 Subject: [PATCH 2/4] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5283a0003..a4c7842c58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ 1. [#1125](https://github.com/influxdata/chronograf/pull/1125): Fix visualizations not showing graph name 1. [#1133](https://github.com/influxdata/chronograf/issue/1133): Fix Enterprise Kapacitor authentication. 1. [#1142](https://github.com/influxdata/chronograf/issue/1142): Fix Kapacitor Telegram config to display correct disableNotification setting + 1. [#1051](https://github.com/influxdata/chronograf/issue/1051): Exit presentation mode when using the browser back button ### Features 1. [#1112](https://github.com/influxdata/chronograf/pull/1112): Add ability to delete a dashboard From 8d5b40c8f35a754c7b4885624da950629bcfcc1c Mon Sep 17 00:00:00 2001 From: Jade McGough Date: Fri, 31 Mar 2017 11:35:28 -0700 Subject: [PATCH 3/4] remove comment --- ui/src/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui/src/index.js b/ui/src/index.js index ac83f5bff0..dababeef3a 100644 --- a/ui/src/index.js +++ b/ui/src/index.js @@ -28,8 +28,6 @@ import 'src/style/chronograf.scss' const store = configureStore(loadLocalStorage()) const rootNode = document.getElementById('react-root') -// c - let browserHistory const basepath = rootNode.dataset.basepath window.basepath = basepath From c0302fcbfd3af9c6fa7f62b337b7352e8bdc2e34 Mon Sep 17 00:00:00 2001 From: Jade McGough Date: Fri, 31 Mar 2017 14:45:53 -0700 Subject: [PATCH 4/4] cleanup function --- ui/src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/index.js b/ui/src/index.js index dababeef3a..2596631aa6 100644 --- a/ui/src/index.js +++ b/ui/src/index.js @@ -40,7 +40,7 @@ if (basepath) { basename: "", }) } -browserHistory.listen(_ => { +browserHistory.listen(() => { store.dispatch(disablePresentationMode()) })