Merge pull request #133 from rashidkpc/master

LABJS Ordering

index.html

@@ -21,7 +21,6 @@
     <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,27 +17,28 @@ var modules = [
 var scripts = []
 var scripts = []
 
 
 var labjs = $LAB
 var labjs = $LAB
+  .script("common/lib/jquery-1.8.0.min.js").wait()
   .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").wait()
   .script("common/lib/angular-strap.min.js")
   .script("common/lib/angular-strap.min.js")
   .script("common/lib/angular-sanitize.min.js")
   .script("common/lib/angular-sanitize.min.js")
   .script("common/lib/elastic.min.js")
   .script("common/lib/elastic.min.js")
-  .script("common/lib/elastic-angular-client.js")
+  .script("common/lib/elastic-angular-client.js").wait()
   .script("common/lib/moment.js")
   .script("common/lib/moment.js")
   .script("common/lib/shared.js")
   .script("common/lib/shared.js")
   .script("common/lib/filesaver.js")
   .script("common/lib/filesaver.js")
   .script("common/lib/bootstrap.min.js")
   .script("common/lib/bootstrap.min.js")
   .script('common/lib/datepicker.js')
   .script('common/lib/datepicker.js')
-  .script('common/lib/timepicker.js')
+  .script('common/lib/timepicker.js').wait()
   .script("js/services.js")
   .script("js/services.js")
   .script("js/controllers.js")
   .script("js/controllers.js")
   .script("js/filters.js")
   .script("js/filters.js")
   .script("js/directives.js")
   .script("js/directives.js")
-  .script("js/panels.js")
+  .script("js/panels.js").wait()
 
 
 _.each(config.modules, function(v) {
 _.each(config.modules, function(v) {
-  labjs = labjs.script('panels/'+v+'/module.js').wait()
+  labjs = labjs.script('panels/'+v+'/module.js')
   modules.push('kibana.'+v)
   modules.push('kibana.'+v)
 })
 })
 
 

panels/histogram/module.js

@@ -278,7 +278,7 @@ angular.module('kibana.histogram', [])
         // Set barwidth based on specified interval
         // Set barwidth based on specified interval
         var barwidth = interval_to_seconds(scope.panel.interval)*1000
         var barwidth = interval_to_seconds(scope.panel.interval)*1000
 
 
-        var scripts = $LAB.script("common/lib/panels/jquery.flot.js")
+        var scripts = $LAB.script("common/lib/panels/jquery.flot.js").wait()
           .script("common/lib/panels/jquery.flot.time.js")
           .script("common/lib/panels/jquery.flot.time.js")
           .script("common/lib/panels/jquery.flot.stack.js")
           .script("common/lib/panels/jquery.flot.stack.js")
           .script("common/lib/panels/jquery.flot.selection.js")
           .script("common/lib/panels/jquery.flot.selection.js")

panels/hits/module.js

@@ -176,7 +176,7 @@ angular.module('kibana.hits', [])
       // Function for rendering panel
       // Function for rendering panel
       function render_panel() {
       function render_panel() {
 
 
-        var scripts = $LAB.script("common/lib/panels/jquery.flot.js")
+        var scripts = $LAB.script("common/lib/panels/jquery.flot.js").wait()
                           .script("common/lib/panels/jquery.flot.pie.js")
                           .script("common/lib/panels/jquery.flot.pie.js")
 
 
         // Populate element.
         // Populate element.

panels/map/module.js

@@ -134,7 +134,7 @@ angular.module('kibana.map', [])
 
 
       function render_panel() {
       function render_panel() {
         // Using LABjs, wait until all scripts are loaded before rendering panel
         // Using LABjs, wait until all scripts are loaded before rendering panel
-        var scripts = $LAB.script("panels/map/lib/jquery.jvectormap.min.js")
+        var scripts = $LAB.script("panels/map/lib/jquery.jvectormap.min.js").wait()
           .script("panels/map/lib/map."+scope.panel.map+".js")
           .script("panels/map/lib/map."+scope.panel.map+".js")
                     
                     
         // Populate element. Note that jvectormap appends, does not replace.
         // Populate element. Note that jvectormap appends, does not replace.

panels/pie/module.js

@@ -206,7 +206,7 @@ angular.module('kibana.pie', [])
 
 
       // Function for rendering panel
       // Function for rendering panel
       function render_panel() {
       function render_panel() {
-        var scripts = $LAB.script("common/lib/panels/jquery.flot.js")
+        var scripts = $LAB.script("common/lib/panels/jquery.flot.js").wait()
                         .script("common/lib/panels/jquery.flot.pie.js")
                         .script("common/lib/panels/jquery.flot.pie.js")
 
 
         if(scope.panel.mode === 'goal')
         if(scope.panel.mode === 'goal')