From bacb4843ee2d53cab8e6e08553aad1e2ad318c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 31 Dec 2013 00:27:17 +0100 Subject: [PATCH] removed a lot of filterSrv functionality --- src/app/controllers/dash.js | 8 +- src/app/controllers/dashLoader.js | 9 +- src/app/controllers/graphiteTarget.js | 1 + src/app/panels/filtering/module.html | 17 +- src/app/panels/filtering/module.js | 11 +- src/app/panels/graphite/module.js | 6 +- src/app/panels/histogram/module.js | 4 +- src/app/panels/timepicker/module.html | 4 +- src/app/panels/timepicker/module.js | 26 +-- src/app/partials/dashboard.html | 3 +- src/app/services/filterSrv.js | 217 +++---------------------- src/css/bootstrap.dark.min.css | 2 +- src/vendor/bootstrap/less/grafana.less | 5 + 13 files changed, 59 insertions(+), 254 deletions(-) diff --git a/src/app/controllers/dash.js b/src/app/controllers/dash.js index 33aeaa576c4..36b65c69a0f 100644 --- a/src/app/controllers/dash.js +++ b/src/app/controllers/dash.js @@ -80,7 +80,7 @@ function (angular, $, config, _) { keyboardManager.bind('ctrl+h', function() { var current = dashboard.current.hideControls; dashboard.current.hideControls = !current; - dashboard.current.panel_hints = !current; + dashboard.current.panel_hints = current; }, { inputDisabled: true }); keyboardManager.bind('ctrl+s', function(evt) { @@ -162,12 +162,6 @@ function (angular, $, config, _) { } }; - $scope.pulldownTabStyle = function(i) { - var classes = ['bgPrimary','bgSuccess','bgWarning','bgDanger','bgInverse','bgInfo']; - i = i%classes.length; - return classes[i]; - }; - $scope.setEditorTabs = function(panelMeta) { $scope.editorTabs = ['General','Panel']; if(!_.isUndefined(panelMeta.editorTabs)) { diff --git a/src/app/controllers/dashLoader.js b/src/app/controllers/dashLoader.js index 1197c662c13..92dca7508c5 100644 --- a/src/app/controllers/dashLoader.js +++ b/src/app/controllers/dashLoader.js @@ -139,7 +139,7 @@ function (angular, _, moment) { // function $scope.zoom // factor :: Zoom factor, so 0.5 = cuts timespan in half, 2 doubles timespan $scope.zoom = function(factor) { - var _range = filterSrv.timeRange('last'); + var _range = filterSrv.timeRange(); var _timespan = (_range.to.valueOf() - _range.from.valueOf()); var _center = _range.to.valueOf() - _timespan/2; @@ -153,12 +153,7 @@ function (angular, _, moment) { _to = Date.now(); } - if(factor > 1) { - filterSrv.removeByType('time'); - } - - filterSrv.set({ - type:'time', + filterSrv.setTime({ from:moment.utc(_from).toDate(), to:moment.utc(_to).toDate(), }); diff --git a/src/app/controllers/graphiteTarget.js b/src/app/controllers/graphiteTarget.js index f8efbe855b8..3e278d2259c 100644 --- a/src/app/controllers/graphiteTarget.js +++ b/src/app/controllers/graphiteTarget.js @@ -28,6 +28,7 @@ function (angular, _, config, graphiteFuncs, Parser) { var astNode = parser.getAst(); if (astNode === null) { checkOtherSegments(0); + return; } if (astNode.type === 'error') { diff --git a/src/app/panels/filtering/module.html b/src/app/panels/filtering/module.html index 565574bd390..35f4d23e5d6 100644 --- a/src/app/panels/filtering/module.html +++ b/src/app/panels/filtering/module.html @@ -1,15 +1,14 @@