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

Merge branch 'develop' into overview

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-08-06 17:26:52 +02:00
commit c2c16b6bd2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/test-main.js
View File

@ -1,9 +1,3 @@
for (var file in window.__karma__.files) {
if (/spec\.js$/.test(file)) {
tests.push(file.replace(/^\/base\//, 'http://localhost:9876/base/'));
}
}
require.config({ require.config({
baseUrl: 'http://localhost:9876/base/app', baseUrl: 'http://localhost:9876/base/app',
@ -93,7 +87,6 @@ require.config({
'angular-loader': ['angular'], 'angular-loader': ['angular'],
'angular-mocks': ['angular'], 'angular-mocks': ['angular'],
'angular-resource': ['angular'], 'angular-resource': ['angular'],
'angular-route': ['angular'],
'angular-touch': ['angular'], 'angular-touch': ['angular'],
'bindonce': ['angular'], 'bindonce': ['angular'],
'angular-strap': ['angular', 'bootstrap','timepicker', 'datepicker'], 'angular-strap': ['angular', 'bootstrap','timepicker', 'datepicker'],
@ -112,6 +105,13 @@ require([
], function(angular) { ], function(angular) {
'use strict'; 'use strict';
for (var file in window.__karma__.files) {
if (/spec\.js$/.test(file)) {
window.tests.push(file.replace(/^\/base\//, 'http://localhost:9876/base/'));
}
}
angular.module('grafana', ['ngRoute']); angular.module('grafana', ['ngRoute']);
angular.module('grafana.services', ['ngRoute', '$strap.directives']); angular.module('grafana.services', ['ngRoute', '$strap.directives']);
angular.module('grafana.panels', []); angular.module('grafana.panels', []);