Commit 4f0042be by Torkel Ödegaard

trying to get more functions to work

parent 21ef0cdc
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
"grunt-contrib-uglify": "~0.2.4", "grunt-contrib-uglify": "~0.2.4",
"load-grunt-tasks": "~0.2.0", "load-grunt-tasks": "~0.2.0",
"glob": "~3.2.7", "glob": "~3.2.7",
"grunt-contrib-connect": "~0.5.0" "grunt-contrib-connect": "~0.5.0",
"mocha": "~1.16.1",
"expect.js": "~0.2.0"
}, },
"license": "Apache License" "license": "Apache License"
} }
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<div class="grafana-target-func-panel"> <div class="grafana-target-func-panel">
<span class="grafana-target-func-panel-icon"> <span class="grafana-target-func-panel-icon">
<i class="icon-long-arrow-right"></i> <!-- <i class="icon-long-arrow-right"></i> -->
</span> </span>
<ul> <ul>
<li ng-repeat="func in functions"> <li ng-repeat="func in functions">
......
...@@ -30,6 +30,13 @@ ...@@ -30,6 +30,13 @@
ng-change="functionParamsChanged(func)" ng-model-onblur ng-change="functionParamsChanged(func)" ng-model-onblur
ng-model="func.params[$index]" /> ng-model="func.params[$index]" />
<input ng-if="param.type === 'string'"
type="text"
focus-me="true"
class="input-small"
ng-change="functionParamsChanged(func)" ng-model-onblur
ng-model="func.params[$index]" />
<select ng-if="param.type === 'node'" <select ng-if="param.type === 'node'"
class="input-mini" class="input-mini"
ng-model="func.params[$index]" ng-model="func.params[$index]"
......
...@@ -12,6 +12,7 @@ function () { ...@@ -12,6 +12,7 @@ function () {
{ {
name: "sumSeries", name: "sumSeries",
params: [], params: [],
defaultParams: []
}, },
{ {
name: "groupByNode", name: "groupByNode",
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
.grafana-target-func-panel-icon { .grafana-target-func-panel-icon {
float: left; float: left;
padding: 1px 7px; padding: 1px 15px;
} }
input[type=text].func-param { input[type=text].func-param {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment