From 9fa0a4c9730130e3493bf94b8d14021849b9a13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 27 Jan 2015 07:47:01 +0100 Subject: [PATCH 1/3] Dashboard: fixed scroll isssue in firefox after dashboard import, Closes #1391 --- src/app/directives/dashEditLink.js | 3 ++- src/app/features/graphite/datasource.js | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/directives/dashEditLink.js b/src/app/directives/dashEditLink.js index b0ac97d3423..638b92fface 100644 --- a/src/app/directives/dashEditLink.js +++ b/src/app/directives/dashEditLink.js @@ -48,7 +48,7 @@ function (angular, $) { if (editorScope) { editorScope.dismiss(); } } - scope.onAppEvent("dashboard-loaded", hideEditorPane); + scope.$on("$destroy", hideEditorPane); scope.onAppEvent('hide-dash-editor', hideEditorPane); scope.onAppEvent('show-dash-editor', function(evt, payload) { @@ -65,6 +65,7 @@ function (angular, $) { editorScope = payload.scope ? payload.scope.$new() : scope.$new(); editorScope.dismiss = function() { + console.log('dismiss: '); editorScope.$destroy(); elem.empty(); lastEditor = null; diff --git a/src/app/features/graphite/datasource.js b/src/app/features/graphite/datasource.js index a486250ac74..1b6c5007017 100644 --- a/src/app/features/graphite/datasource.js +++ b/src/app/features/graphite/datasource.js @@ -158,7 +158,6 @@ function (angular, _, $, config, kbn, moment) { date = date.replace('M', 'mon'); return date; } - date = kbn.parseDate(date); } From c0353ab5d82183ec22a050d2d6849e79ada375c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 27 Jan 2015 07:56:23 +0100 Subject: [PATCH 2/3] Graph: fix for legend show/hide toggle, after hiding requires new data fetch to show, Fixes #1393 --- src/app/panels/graph/axisEditor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/panels/graph/axisEditor.html b/src/app/panels/graph/axisEditor.html index b2c2437e89b..34f624e28e4 100644 --- a/src/app/panels/graph/axisEditor.html +++ b/src/app/panels/graph/axisEditor.html @@ -150,7 +150,7 @@
  • Show  + ng-model="panel.legend.show" ng-checked="panel.legend.show" ng-change="get_data()">
  • From cf5595bd64d08d50664ce3bf7f24ea24d828ab90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 28 Jan 2015 14:24:11 +0100 Subject: [PATCH 3/3] mini fix for submenuEnabled being undefined, when initiating a dashboard with empty model --- src/app/features/dashboard/dashboardCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/dashboard/dashboardCtrl.js b/src/app/features/dashboard/dashboardCtrl.js index 0aee19d82e4..c88d6dfa725 100644 --- a/src/app/features/dashboard/dashboardCtrl.js +++ b/src/app/features/dashboard/dashboardCtrl.js @@ -105,7 +105,7 @@ function (angular, $, config, _) { }; $scope.checkFeatureToggles = function() { - $scope.submenuEnabled = $scope.dashboard.templating.enable || $scope.dashboard.annotations.enable; + $scope.submenuEnabled = $scope.dashboard.templating.enable || $scope.dashboard.annotations.enable || false; }; $scope.onDrop = function(panelId, row, dropTarget) {