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

Fixed js concat issue

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-03-04 10:04:59 +01:00
parent 14766ad38e
commit d043ee9407
5 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/options/concat.js
View File

@@ -30,7 +30,7 @@ module.exports = function(config) {
js: {
src: [
'<%= destDir %>/vendor/require/require.js',
'<%= destDir %>/app/components/require.<%= mode %>.js',
'<%= destDir %>/app/components/require.config.js',
'<%= destDir %>/app/app.js',
],
dest: '<%= destDir %>/app/app.js'

2
tasks/options/ngAnnotate.js
View File

@@ -5,13 +5,13 @@ module.exports = function(config) {
cwd:'<%= tempDir %>',
src: [
'app/controllers/**/*.js',
'app/plugins/**/*.js',
'app/directives/**/*.js',
'app/services/**/*.js',
'app/filters/**/*.js',
'app/features/**/*.js',
'app/panels/**/*.js',
'app/routes/**/*.js',
'plugins/**/*.js',
'app/app.js',
'vendor/angular/**/*.js',
],