From d043ee9407a23518d62008d309d56aaeaaf54b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 4 Mar 2015 10:04:59 +0100
Subject: [PATCH] Fixed js concat issue

---
 .gitignore                  |  2 +-
 conf/custom.ini             | 12 ------------
 src/views/index.html        |  2 +-
 tasks/options/concat.js     |  2 +-
 tasks/options/ngAnnotate.js |  2 +-
 5 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 conf/custom.ini

diff --git a/.gitignore b/.gitignore
index c1491666d88..151582dc1be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,5 +20,5 @@ src/css/*.min.css
 /grafana-pro
 /grafana
 
-grafana.custom.ini
+conf/custom.ini
 fig.yml
diff --git a/conf/custom.ini b/conf/custom.ini
deleted file mode 100644
index 04de2635860..00000000000
--- a/conf/custom.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-app_mode = development
-
-[server]
-router_logging = false
-static_root_path = src
-
-[log]
-level = Trace
-mode = console
-
-
-
diff --git a/src/views/index.html b/src/views/index.html
index a5b0dbba05c..c29fdd5a28a 100644
--- a/src/views/index.html
+++ b/src/views/index.html
@@ -22,7 +22,7 @@
 
 		<!-- build:js app/app.js -->
     <script src="[[.AppSubUrl]]/public/vendor/require/require.js"></script>
-    <script src="[[.AppSubUrl]]/public/app/components/require.config.js"></script>
+    <script src="[[.AppSubUrl]]/public/app/components/require.backend.js"></script>
     <!-- endbuild -->
   </head>
 
diff --git a/tasks/options/concat.js b/tasks/options/concat.js
index 6257547f399..2a88d23bb77 100644
--- a/tasks/options/concat.js
+++ b/tasks/options/concat.js
@@ -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'
diff --git a/tasks/options/ngAnnotate.js b/tasks/options/ngAnnotate.js
index e0fd2dba7c9..816532096c2 100644
--- a/tasks/options/ngAnnotate.js
+++ b/tasks/options/ngAnnotate.js
@@ -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',
       ],