Commit 8f88bd5e by Rashid Khan

Fixed potential jquery race

parent 82e40230
...@@ -3,7 +3,6 @@ ...@@ -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'
} }
......
...@@ -21,6 +21,7 @@ ...@@ -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>
......
...@@ -17,7 +17,6 @@ var modules = [ ...@@ -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")
......
...@@ -118,7 +118,7 @@ angular.module('kibana.histogram', []) ...@@ -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) {
......
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