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

Fixed potential jquery race

Browse Source
This commit is contained in:
Rashid Khan 2013-05-29 12:07:05 -07:00
parent 82e40230a8
commit 8f88bd5e52
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/lib/settings.js
View File

@ -3,7 +3,6 @@
var Settings = function (s) { var Settings = function (s) {
var _d = { var _d = {
elasticsearch : 'localhost:9200', elasticsearch : 'localhost:9200',
timeformat : 'mm/dd HH:MM:ss',
modules : [], modules : [],
kibana_index : 'kibana-int' kibana_index : 'kibana-int'
} }

1
index.html
View File

@ -21,6 +21,7 @@
<link rel="stylesheet" href="common/css/timepicker.css"> <link rel="stylesheet" href="common/css/timepicker.css">
<!-- project dependency libs --> <!-- project dependency libs -->
<script src="common/lib/jquery-1.8.0.min.js"></script>
<script src="common/lib/LAB.min.js"></script> <script src="common/lib/LAB.min.js"></script>
<script src="common/lib/underscore.min.js"></script> <script src="common/lib/underscore.min.js"></script>
<script src="common/lib/settings.js"></script> <script src="common/lib/settings.js"></script>

1
js/app.js
View File

@ -17,7 +17,6 @@ var modules = [
var scripts = [] var scripts = []
var labjs = $LAB var labjs = $LAB
.script("common/lib/jquery-1.8.0.min.js")
.script("common/lib/modernizr-2.6.1.min.js") .script("common/lib/modernizr-2.6.1.min.js")
.script("common/lib/underscore.min.js") .script("common/lib/underscore.min.js")
.script("common/lib/angular.min.js") .script("common/lib/angular.min.js")

2
panels/histogram/module.js
View File

@ -118,7 +118,7 @@ angular.module('kibana.histogram', [])
$scope.panel.loading = true; $scope.panel.loading = true;
var _segment = _.isUndefined(segment) ? 0 : segment var _segment = _.isUndefined(segment) ? 0 : segment
var request = $scope.ejs.Request().indices($scope.index[_segment]); var request = $scope.ejs.Request().indices($scope.index[_segment]);
// Build the question part of the query // Build the question part of the query
var queries = []; var queries = [];
_.each($scope.panel.query, function(v) { _.each($scope.panel.query, function(v) {