Merge pull request #132 from rashidkpc/master

Fix for jquery race when using firebug

common/lib/settings.js

@@ -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'
   }
   }

index.html

@@ -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>

js/app.js

@@ -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")