summaryrefslogtreecommitdiff
path: root/openstack_dashboard/karma.conf.js
diff options
context:
space:
mode:
authorRichard Jones <r1chardj0n3s@gmail.com>2015-05-22 16:23:32 -0700
committerRichard Jones <r1chardj0n3s@gmail.com>2015-06-18 14:43:35 +1000
commit2270e9139b23b8c9e52979bf7beb162ddfa516b5 (patch)
tree77348a2ee467c56f25197bdb752b687635756dde /openstack_dashboard/karma.conf.js
parente44d95fa2146b2fc94c10d13985977b6402ff567 (diff)
downloadhorizon-2270e9139b23b8c9e52979bf7beb162ddfa516b5.tar.gz
ngReorg - move dashboard-app to dashboard
Move the angular app module from the framework to openstack_dashboard at the top level as "horizon.app". This edit also removes the old hzUtils.log function: it exists in the framework, but is configured in the application, thus causing dependency issues. It is only used in one place (hz.tables.js), and for debugging. I contend that if debugging is needed then $log can be asked for as needed. The hzConfig.debug flag was only used by that one function, so it is also removed in this edit. Change-Id: Ie538940cd8d1b0eabe677790bad979cc146bfbd1 Closes-Bug: #1458697 Closes-Bug: #1465885
Diffstat (limited to 'openstack_dashboard/karma.conf.js')
-rw-r--r--openstack_dashboard/karma.conf.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/openstack_dashboard/karma.conf.js b/openstack_dashboard/karma.conf.js
index bcb2b2706..5a7de8a18 100644
--- a/openstack_dashboard/karma.conf.js
+++ b/openstack_dashboard/karma.conf.js
@@ -71,7 +71,8 @@ module.exports = function(config) {
'openstack-service-api/openstack-service-api.module.js',
'openstack-service-api/**/*.js',
- // This one seems to have to come first.
+ // first load dependencies in order that matters
+ "app/app.module.js",
"dashboard/dashboard.module.js",
"dashboard/workflow/workflow.js",
"dashboard/launch-instance/launch-instance.js",