From b85fe623894197ef045ef4f99a6e92774f3a65ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 20 Oct 2014 10:06:34 -0400 Subject: [PATCH 1/5] Graph: series override dropdown menu select did not work after recent commit that added typeahead to this dropdown --- src/app/directives/dropdown.typeahead.js | 11 +++++++++++ src/app/panels/graph/seriesOverridesCtrl.js | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app/directives/dropdown.typeahead.js b/src/app/directives/dropdown.typeahead.js index e02b90b2576..f46de052c06 100644 --- a/src/app/directives/dropdown.typeahead.js +++ b/src/app/directives/dropdown.typeahead.js @@ -37,6 +37,17 @@ function (angular, app, _, $) { return memo; }, []); + $scope.menuItemSelected = function(optionIndex, valueIndex) { + var option = $scope.menuItems[optionIndex]; + var result = { + $item: option.submenu[valueIndex], + $optionIndex: optionIndex, + $valueIndex: valueIndex + }; + + $scope.dropdownTypeaheadOnSelect(result); + }; + $input.attr('data-provide', 'typeahead'); $input.typeahead({ source: typeaheadValues, diff --git a/src/app/panels/graph/seriesOverridesCtrl.js b/src/app/panels/graph/seriesOverridesCtrl.js index bf46b086bea..b677bf19e17 100644 --- a/src/app/panels/graph/seriesOverridesCtrl.js +++ b/src/app/panels/graph/seriesOverridesCtrl.js @@ -23,7 +23,7 @@ define([ option.submenu = _.map(values, function(value, index) { return { text: String(value), - click: 'setOverride(' + option.index + ',' + index + ')' + click: 'menuItemSelected(' + option.index + ',' + index + ')' }; }); From 8a80ea26b866b77c4d333660b9b16c3dd8d3558b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 20 Oct 2014 10:10:18 -0400 Subject: [PATCH 2/5] Graph: fix for series override controller unit test --- src/test/specs/seriesOverridesCtrl-specs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/specs/seriesOverridesCtrl-specs.js b/src/test/specs/seriesOverridesCtrl-specs.js index e211b6dab35..6a96c77416d 100644 --- a/src/test/specs/seriesOverridesCtrl-specs.js +++ b/src/test/specs/seriesOverridesCtrl-specs.js @@ -18,7 +18,7 @@ define([ describe('Controller should init overrideMenu', function() { it('click should include option and value index', function() { - expect(ctx.scope.overrideMenu[1].submenu[1].click).to.be('setOverride(1,1)'); + expect(ctx.scope.overrideMenu[1].submenu[1].click).to.be('menuItemSelected(1,1)'); }); }); From ff254ce08daaf2ee92573719269539ef444c89fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 20 Oct 2014 11:33:07 -0400 Subject: [PATCH 3/5] Help: fix for help modal shortcut, and added missing shortcut, #952 --- src/app/partials/help_modal.html | 4 ++++ src/app/services/dashboard/dashboardKeyBindings.js | 2 +- src/app/services/keyboardManager.js | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/partials/help_modal.html b/src/app/partials/help_modal.html index 8fca3680fa0..866d44898eb 100644 --- a/src/app/partials/help_modal.html +++ b/src/app/partials/help_modal.html @@ -36,6 +36,10 @@ CTRL+R Refresh (Fetches new data and rerenders panels) + + CTRL+O + Enable/Disable shared graph crosshair + diff --git a/src/app/services/dashboard/dashboardKeyBindings.js b/src/app/services/dashboard/dashboardKeyBindings.js index c87b07db622..d5e0c1609c0 100644 --- a/src/app/services/dashboard/dashboardKeyBindings.js +++ b/src/app/services/dashboard/dashboardKeyBindings.js @@ -23,7 +23,7 @@ function(angular, $) { }); var helpModalScope = null; - keyboardManager.bind('shift+¿', function() { + keyboardManager.bind('shift+?', function() { if (helpModalScope) { return; } helpModalScope = $rootScope.$new(); diff --git a/src/app/services/keyboardManager.js b/src/app/services/keyboardManager.js index 72124fe76af..10d5db03f45 100644 --- a/src/app/services/keyboardManager.js +++ b/src/app/services/keyboardManager.js @@ -61,6 +61,7 @@ function (angular) { else if (e.which) { code = e.which; } + var character = String.fromCharCode(code).toLowerCase(); if (code === 188) { @@ -93,6 +94,9 @@ function (angular) { ",": "<", ".": ">", "/": "?", + "»": "?", + "«": "?", + "¿": "?", "\\": "|" }; // Special Keys - and their codes From 6c83699e6f33d4b13d05ae407a23516aaef997bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 20 Oct 2014 12:14:58 -0400 Subject: [PATCH 4/5] Panel: css fix for panel fullscreen/edit mode for latest chrome 38 and Firefox 33, #954 --- src/app/dashboards/default.json | 1 - src/app/dashboards/scripted.js | 11 +++++++++++ src/app/dashboards/template_vars.json | 1 - src/app/panels/graph/module.js | 4 ---- src/css/less/grafana.less | 8 +++++--- src/css/less/submenu.less | 2 +- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/app/dashboards/default.json b/src/app/dashboards/default.json index 241e663d5ea..931d4c6f802 100644 --- a/src/app/dashboards/default.json +++ b/src/app/dashboards/default.json @@ -101,7 +101,6 @@ "legend_counts": true, "timezone": "browser", "percentage": false, - "zerofill": true, "nullPointMode": "connected", "steppedLine": false, "tooltip": { diff --git a/src/app/dashboards/scripted.js b/src/app/dashboards/scripted.js index b8f428a9834..f4a438b7854 100644 --- a/src/app/dashboards/scripted.js +++ b/src/app/dashboards/scripted.js @@ -68,6 +68,17 @@ for (var i = 0; i < rows; i++) { 'target': "randomWalk('random walk2')" } ], + seriesOverrides: [ + { + alias: '/random/', + yaxis: 2, + fill: 0, + linewidth: 5 + } + ], + tooltip: { + shared: true + } } ] }); diff --git a/src/app/dashboards/template_vars.json b/src/app/dashboards/template_vars.json index affe7727ce2..43e9e37836c 100644 --- a/src/app/dashboards/template_vars.json +++ b/src/app/dashboards/template_vars.json @@ -65,7 +65,6 @@ "avg": false }, "percentage": false, - "zerofill": true, "nullPointMode": "connected", "steppedLine": false, "tooltip": { diff --git a/src/app/panels/graph/module.js b/src/app/panels/graph/module.js index a1dbc942553..54a2a028fe6 100644 --- a/src/app/panels/graph/module.js +++ b/src/app/panels/graph/module.js @@ -151,10 +151,6 @@ function (angular, app, $, _, kbn, moment, TimeSeries) { * queries */ percentage : false, - /** @scratch /panels/histogram/3 - * zerofill:: Improves the accuracy of line charts at a small performance cost. - */ - zerofill : true, nullPointMode : 'connected', diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less index 1f676b97531..668feefdef0 100644 --- a/src/css/less/grafana.less +++ b/src/css/less/grafana.less @@ -115,7 +115,7 @@ position: fixed; left: 0px; right: 0px; - top: 54px; + top: 51px; height: 100%; padding: 0 10px; background: @grafanaPanelBackground; @@ -133,9 +133,11 @@ .dashboard-fullscreen { .main-view-container { - height: 0; overflow: hidden; - padding: 0; + height: 0; + .row-control-inner { + display: none; + } } } diff --git a/src/css/less/submenu.less b/src/css/less/submenu.less index b762d7acfbd..52bd1c81e92 100644 --- a/src/css/less/submenu.less +++ b/src/css/less/submenu.less @@ -1,6 +1,6 @@ .submenu-controls-visible:not(.hide-controls) { .panel-fullscreen { - top: 91px; + top: 88px; } } From 79c5d48a3cd73ec1f5ec106af89b08321b1f1745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 23 Oct 2014 12:36:25 +0200 Subject: [PATCH 5/5] Timepicker: Fix for Zoom out top menu link still visible when timepicker was disabled, Fixes #963 --- src/app/panels/timepicker/module.html | 29 ++++++++++++++++---------- src/app/partials/dashboard_topnav.html | 6 ------ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/app/panels/timepicker/module.html b/src/app/panels/timepicker/module.html index 9371eb16f2e..c4cd4069e91 100644 --- a/src/app/panels/timepicker/module.html +++ b/src/app/panels/timepicker/module.html @@ -10,19 +10,26 @@ }
-