From 816cc98658ab390f52a2252f43f699d83e28be4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 20 Dec 2013 08:37:48 +0100 Subject: [PATCH] working on graphite target editor --- src/app/controllers/graphiteTarget.js | 12 +++++++++--- src/app/panels/graphite/editor.html | 5 ++--- src/vendor/bootstrap/less/grafana.less | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/app/controllers/graphiteTarget.js b/src/app/controllers/graphiteTarget.js index 043013723f6..e45452d1a3b 100644 --- a/src/app/controllers/graphiteTarget.js +++ b/src/app/controllers/graphiteTarget.js @@ -14,15 +14,21 @@ function (angular, _) { var strSegments = $scope.target.target.split('.'); _.each(strSegments, function (segment, index) { if (segment === '*') { - segment = ''; + $scope.segments[index] = { val: segment, html: '' }; + return; } - $scope.segments[index] = { val: segment }; + $scope.segments[index] = { val: segment, html: segment}; }); }; $scope.setSegmentStar = function (index) { - $scope.segments[index] = {val: '' }; + $scope.segments[index].val = '*'; + $scope.segments[index].html = ''; + $scope.target.target = _.reduce($scope.segments, function(result, segment) { + return result ? (result + "." + segment.val) : segment.val; + }, null); + $scope.targetChanged(); }; $scope.targetChanged = function() { diff --git a/src/app/panels/graphite/editor.html b/src/app/panels/graphite/editor.html index 2a2770409f3..78acd39e92e 100644 --- a/src/app/panels/graphite/editor.html +++ b/src/app/panels/graphite/editor.html @@ -15,7 +15,6 @@ .grafana-segment-list { list-style: none; margin: 0; - margin-left: 5px; } .grafana-segment-list li { float: left; @@ -42,13 +41,13 @@ - +