11 years ago · 3f9a8ecc7e
--- a/package.json
+++ b/package.json
@@ -53,5 +53,8 @@
 
				   "scripts": {
			
 
				     "test": "grunt test"
			
 
				   },
			
 
				-  "license": "Apache License"
			
 
				+  "license": "Apache License",
			
 
				+  "dependencies": {
			
 
				+    "grunt-contrib-concat": "^0.4.0"
			
 
				+  }
			
 
				 }
			
--- a/src/app/controllers/influxTargetCtrl.js
+++ b/src/app/controllers/influxTargetCtrl.js
@@ -17,7 +17,10 @@ function (angular) {
 
				 
			
 
				       $scope.rawQuery = false;
			
 
				 
			
 
				-      $scope.functions = ['count', 'mean', 'sum', 'min', 'max', 'mode', 'distinct', 'median', 'derivative', 'stddev', 'first', 'last'];
			
 
				+      $scope.functions = ['count', 'mean', 'sum', 'min',
			
 
				+                          'max', 'mode', 'distinct', 'median',
			
 
				+                          'derivative', 'stddev', 'first', 'last',
			
 
				+                          'difference'];
			
 
				       $scope.operators = ['=', '=~', '>', '<', '!~', '<>'];
			
 
				       $scope.oldSeries = $scope.target.series;
			
 
				       $scope.$on('typeahead-updated', function(){
			
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -23,8 +23,7 @@ function (angular, _, kbn) {
 
				       };
			
 
				     }
			
 
				 
			
 
				-    InfluxDatasource.prototype.query = function(options) {
			
 
				-
			
 
				+    InfluxDatasource.prototype.query = function(filterSrv, options) {
			
 
				       var promises = _.map(options.targets, function(target) {
			
 
				         var query;
			
 
				 
			
--- a/src/css/default.min.css
+++ b/src/css/default.min.css
--- a/src/index.html
+++ b/src/index.html
@@ -7,23 +7,16 @@
 
				     <meta name="viewport" content="width=device-width">
			
 
				 
			
 
				     <title>Grafana</title>
			
 
				-    <link rel="stylesheet" href="css/bootstrap.dark.min.css" title="Light">
			
 
				-    <link rel="stylesheet" href="css/timepicker.css">
			
 
				-    <link rel="stylesheet" href="css/spectrum.css">
			
 
				-    <link rel="stylesheet" href="css/animate.min.css">
			
 
				-    <link rel="stylesheet" href="css/normalize.min.css">
			
 
				+    <link rel="stylesheet" href="css/default.min.css" title="Light">
			
 
				     <!-- load the root require context -->
			
 
				     <script src="vendor/require/require.js"></script>
			
 
				     <script src="app/components/require.config.js"></script>
			
 
				     <script>require(['app'], function () {})</script>
			
 
				-    <style>
			
 
				-    </style>
			
 
				 
			
 
				   </head>
			
 
				 
			
 
				   <body ng-cloak body-class>
			
 
				 
			
 
				-    <!--<link rel="stylesheet" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">-->
			
 
				     <link rel="stylesheet" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">
			
 
				     <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
			
 
				     <link rel="stylesheet" href="css/font-awesome.min.css">
			
--- a/tasks/default_task.js
+++ b/tasks/default_task.js
@@ -1,5 +1,5 @@
 
				 // Lint and build CSS
			
 
				 module.exports = function(grunt) {
			
 
				-  grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src']);
			
 
				+  grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src', 'concat']);
			
 
				   grunt.registerTask('test', ['default', 'karma:test']);
			
 
				-};
			
 
				+};
			
--- a/tasks/options/concat.js
+++ b/tasks/options/concat.js
@@ -0,0 +1,14 @@
 
				+module.exports = function(config) {
			
 
				+  return {
			
 
				+    css: {
			
 
				+      src: [
			
 
				+        '<%= srcDir %>/css/normalize.min.css', 
			
 
				+        '<%= srcDir %>/css/bootstrap.dark.min.css', 
			
 
				+        '<%= srcDir %>/css/timepicker.css', 
			
 
				+        '<%= srcDir &>/css/spectrum.css',
			
 
				+        '<%= srcDir &>/css/animate.min.css'
			
 
				+      ],
			
 
				+      dest: '<%= srcDir %>/css/default.min.css'
			
 
				+    },
			
 
				+  };
			
 
				+};