IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-24 09:50:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Load ordering specifications for LABJS

Browse Source
This commit is contained in:
Rashid Khan 2013-05-29 12:30:38 -07:00
parent 8f88bd5e52
commit 6eae38eb3c
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
index.html
View File

@ -21,7 +21,6 @@
<link rel="stylesheet" href="common/css/timepicker.css">
<!-- 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/underscore.min.js"></script>
<script src="common/lib/settings.js"></script>

11
js/app.js
View File

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

2
panels/histogram/module.js
View File

@ -278,7 +278,7 @@ angular.module('kibana.histogram', [])
// Set barwidth based on specified interval
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.stack.js")
.script("common/lib/panels/jquery.flot.selection.js")

2
panels/hits/module.js
View File

@ -176,7 +176,7 @@ angular.module('kibana.hits', [])
// Function for rendering 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")
// Populate element.

2
panels/map/module.js
View File

@ -134,7 +134,7 @@ angular.module('kibana.map', [])
function render_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")
// Populate element. Note that jvectormap appends, does not replace.

2
panels/pie/module.js
View File

@ -206,7 +206,7 @@ angular.module('kibana.pie', [])
// Function for rendering 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")
if(scope.panel.mode === 'goal')