From d1e33ec071e43c92e18ed8388123d9184803485b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 31 Dec 2014 11:48:15 +0100
Subject: [PATCH] Moved routes

---
 src/app/app.js                                |  3 +--
 src/app/routes/all.js                         |  7 ------
 src/app/routes/dashboard-default.js           | 20 ----------------
 src/app/routes/standalone/default.js          | 23 +++++++++++++++++++
 .../fromDB.js}                                |  0
 .../fromFile.js}                              |  0
 .../fromScript.js}                            |  0
 tasks/options/requirejs.js                    |  2 +-
 8 files changed, 25 insertions(+), 30 deletions(-)
 delete mode 100644 src/app/routes/all.js
 delete mode 100644 src/app/routes/dashboard-default.js
 create mode 100644 src/app/routes/standalone/default.js
 rename src/app/routes/{dashboard-from-db.js => standalone/fromDB.js} (100%)
 rename src/app/routes/{dashboard-from-file.js => standalone/fromFile.js} (100%)
 rename src/app/routes/{dashboard-from-script.js => standalone/fromScript.js} (100%)

diff --git a/src/app/app.js b/src/app/app.js
index 86e5c8e3bcc..b1429f02550 100644
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -50,7 +50,6 @@ function (angular, $, _, appLevelRequire, config) {
   };
 
   app.config(function ($routeProvider, $controllerProvider, $compileProvider, $filterProvider, $provide) {
-
     $routeProvider.otherwise({ redirectTo: config.default_route });
     // this is how the internet told me to dynamically add modules :/
     register_fns.controller = $controllerProvider.register;
@@ -86,7 +85,7 @@ function (angular, $, _, appLevelRequire, config) {
     'directives/all',
     'filters/all',
     'components/partials',
-    'routes/all',
+    'routes/standalone/default',
   ];
 
   _.each(config.plugins.dependencies, function(dep) {
diff --git a/src/app/routes/all.js b/src/app/routes/all.js
deleted file mode 100644
index 5342515d545..00000000000
--- a/src/app/routes/all.js
+++ /dev/null
@@ -1,7 +0,0 @@
-define([
-  './dashboard-from-db',
-  './dashboard-from-file',
-  './dashboard-from-script',
-  './dashboard-default',
-],
-function () {});
diff --git a/src/app/routes/dashboard-default.js b/src/app/routes/dashboard-default.js
deleted file mode 100644
index 6721525b9e4..00000000000
--- a/src/app/routes/dashboard-default.js
+++ /dev/null
@@ -1,20 +0,0 @@
-define([
-  'angular',
-  'config',
-  'store'
-],
-function (angular, config, store) {
-  "use strict";
-
-  var module = angular.module('grafana.routes');
-
-  module.config(function($routeProvider) {
-    $routeProvider
-      .when('/', {
-        redirectTo: function() {
-          return store.get('grafanaDashboardDefault') || config.default_route;
-        }
-      });
-  });
-
-});
diff --git a/src/app/routes/standalone/default.js b/src/app/routes/standalone/default.js
new file mode 100644
index 00000000000..6edd50369eb
--- /dev/null
+++ b/src/app/routes/standalone/default.js
@@ -0,0 +1,23 @@
+define([
+  'angular',
+  'config',
+  'store',
+  './fromDB',
+  './fromFile',
+  './fromScript',
+],
+function (angular, config, store) {
+  'use strict';
+
+  var module = angular.module('grafana.routes');
+
+  module.config(function($routeProvider) {
+    $routeProvider
+    .when('/', {
+      redirectTo: function() {
+        return store.get('grafanaDashboardDefault') || config.default_route;
+      }
+    });
+  });
+
+});
diff --git a/src/app/routes/dashboard-from-db.js b/src/app/routes/standalone/fromDB.js
similarity index 100%
rename from src/app/routes/dashboard-from-db.js
rename to src/app/routes/standalone/fromDB.js
diff --git a/src/app/routes/dashboard-from-file.js b/src/app/routes/standalone/fromFile.js
similarity index 100%
rename from src/app/routes/dashboard-from-file.js
rename to src/app/routes/standalone/fromFile.js
diff --git a/src/app/routes/dashboard-from-script.js b/src/app/routes/standalone/fromScript.js
similarity index 100%
rename from src/app/routes/dashboard-from-script.js
rename to src/app/routes/standalone/fromScript.js
diff --git a/tasks/options/requirejs.js b/tasks/options/requirejs.js
index a889b9fd154..49830d90087 100644
--- a/tasks/options/requirejs.js
+++ b/tasks/options/requirejs.js
@@ -62,7 +62,7 @@ module.exports = function(config,grunt) {
         'directives/all',
         'filters/all',
         'controllers/all',
-        'routes/all',
+        'routes/standalone/default',
         'components/partials',
       ]
     }