IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #191, update graph after adding new function and not changing default value

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-03-11 13:00:28 +01:00
parent b396563235
commit 9ebf769b4d
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -4,7 +4,7 @@
"company": "Coding Instinct AB"
},
"name": "grafana",
"version": "1.5.0",
"version": "1.5.1",
"repository": {
"type": "git",
"url": "http://github.com/torkelo/grafana.git"

10
src/app/controllers/graphiteTarget.js
View File

@ -211,10 +211,14 @@ function (angular, _, config, gfunc, Parser) {
return;
}
var oldTarget = $scope.target.target;
var target = getSegmentPathUpTo($scope.segments.length);
target = _.reduce($scope.functions, wrapFunction, target);
$scope.target.target = target;
$scope.$parent.get_data();
$scope.target.target = _.reduce($scope.functions, wrapFunction, target);
if ($scope.target.target !== oldTarget) {
$scope.$parent.get_data();
}
};
$scope.removeFunction = function(func) {

7
src/app/directives/graphiteFuncEditor.js
View File

@ -60,11 +60,8 @@ function (angular, _, $) {
if ($input.val() !== '') {
$link.text($input.val());
if (func.updateParam($input.val(), paramIndex)) {
$scope.$apply(function() {
$scope.targetChanged();
});
}
func.updateParam($input.val(), paramIndex);
$scope.$apply($scope.targetChanged);
}
$input.hide();

4
src/app/services/graphite/gfunc.js
View File

@ -314,8 +314,6 @@ function (_) {
};
FuncInstance.prototype.updateParam = function(strValue, index) {
var oldValue = this.params[index];
if (this.def.params[index].type === 'int') {
this.params[index] = parseInt(strValue, 10);
}
@ -324,8 +322,6 @@ function (_) {
}
this.updateText();
return oldValue !== this.params[index];
};
FuncInstance.prototype.updateText = function () {