Moved routes

pull/1019/merge
Torkel Ödegaard 11 years ago
parent 39f3cfc1eb
commit d1e33ec071
  1. 3
      src/app/app.js
  2. 7
      src/app/routes/all.js
  3. 20
      src/app/routes/dashboard-default.js
  4. 23
      src/app/routes/standalone/default.js
  5. 0
      src/app/routes/standalone/fromDB.js
  6. 0
      src/app/routes/standalone/fromFile.js
  7. 0
      src/app/routes/standalone/fromScript.js
  8. 2
      tasks/options/requirejs.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) {

@ -1,7 +0,0 @@
define([
'./dashboard-from-db',
'./dashboard-from-file',
'./dashboard-from-script',
'./dashboard-default',
],
function () {});

@ -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;
}
});
});
});

@ -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;
}
});
});
});

@ -62,7 +62,7 @@ module.exports = function(config,grunt) {
'directives/all',
'filters/all',
'controllers/all',
'routes/all',
'routes/standalone/default',
'components/partials',
]
}

Loading…
Cancel
Save