Parcourir la source

trying to get more functions to work

Torkel Ödegaard il y a 12 ans
Parent
commit
4f0042bed1

+ 3 - 1
package.json

@@ -28,7 +28,9 @@
     "grunt-contrib-uglify": "~0.2.4",
     "load-grunt-tasks": "~0.2.0",
     "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"
 }

+ 1 - 1
src/app/panels/graphite/editor.html

@@ -31,7 +31,7 @@
 
     <div class="grafana-target-func-panel">
       <span class="grafana-target-func-panel-icon">
-        <i class="icon-long-arrow-right"></i>
+        <!-- <i class="icon-long-arrow-right"></i> -->
       </span>
       <ul>
         <li ng-repeat="func in functions">

+ 7 - 0
src/app/panels/graphite/funcEditor.html

@@ -30,6 +30,13 @@
               ng-change="functionParamsChanged(func)" ng-model-onblur
               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'"
                   class="input-mini"
                   ng-model="func.params[$index]"

+ 1 - 0
src/app/services/graphite/functions.js

@@ -12,6 +12,7 @@ function () {
     {
       name: "sumSeries",
       params: [],
+      defaultParams: []
     },
     {
       name: "groupByNode",

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
src/css/bootstrap.dark.min.css


+ 1 - 1
src/vendor/bootstrap/less/grafana.less

@@ -160,7 +160,7 @@
 
 .grafana-target-func-panel-icon {
   float: left;
-  padding: 1px 7px;
+  padding: 1px 15px;
 }
 
 input[type=text].func-param {

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff