dev building and optimized builds work

This commit is contained in:
Torkel Ödegaard
2015-09-10 12:42:24 +02:00
parent abac8bccc6
commit da832368f0
19 changed files with 52 additions and 62 deletions
-1
View File
@@ -8,7 +8,6 @@ function (angular) {
var module = angular.module('grafana.controllers');
module.controller('ErrorCtrl', function($scope, contextSrv) {
var showSideMenu = contextSrv.sidemenu;
+4 -4
View File
@@ -9,10 +9,10 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
'public/test/test-main.js',
{pattern: 'public/.app_gen/**/*.js', included: false},
{pattern: 'public/vendor/**/*.js', included: false},
{pattern: 'public/test/**/*.js', included: false},
{pattern: 'public/**/*.js', included: false}
{pattern: 'public_gen/.app_gen/**/*.js', included: false},
{pattern: 'public_gen/vendor/**/*.js', included: false},
{pattern: 'public_gen/test/**/*.js', included: false},
{pattern: 'public_gen/**/*.js', included: false}
],
// list of files to exclude
+1 -1
View File
@@ -1,5 +1,5 @@
require.config({
baseUrl: 'http://localhost:9876/base/public/app_gen',
baseUrl: 'http://localhost:9876/base/public_gen/app',
paths: {
specs: '../test/specs',