From ed15bdeb63228d1e544f7b486fb12dc8ce16171d Mon Sep 17 00:00:00 2001 From: Joe Fiorini Date: Tue, 3 Feb 2015 16:51:18 -0500 Subject: [PATCH] Fix build order with new module files The two renamed files represent files that merely define angular modules. Unfortunately, in minification mode, they were getting processed out of order with files that depend on them. Since we don't have any sort of native module or dependency resolution (YET), I'm hacking it to make sure they come first asciibetically. --- awx/ui/static/js/app.js | 4 ++-- .../directives/{dashboard-graphs.js => _dashboard-graphs.js} | 0 .../js/services/{data-services.js => _data-services.js} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename awx/ui/static/js/directives/{dashboard-graphs.js => _dashboard-graphs.js} (100%) rename awx/ui/static/js/services/{data-services.js => _data-services.js} (100%) diff --git a/awx/ui/static/js/app.js b/awx/ui/static/js/app.js index 571741ee9c..eaa5c10bdd 100644 --- a/awx/ui/static/js/app.js +++ b/awx/ui/static/js/app.js @@ -400,12 +400,12 @@ angular.module('Tower', [ templateUrl: urlPrefix + 'partials/home.html', controller: 'Home', resolve: { - graphData: function($q, jobStatusGraphData, hostCountGraphData) { + graphData: ['$q', 'jobStatusGraphData', 'hostCountGraphData', function($q, jobStatusGraphData, hostCountGraphData) { return $q.all({ jobStatus: jobStatusGraphData.get("month", "all"), hostCounts: hostCountGraphData.get() }); - } + }] } }). diff --git a/awx/ui/static/js/directives/dashboard-graphs.js b/awx/ui/static/js/directives/_dashboard-graphs.js similarity index 100% rename from awx/ui/static/js/directives/dashboard-graphs.js rename to awx/ui/static/js/directives/_dashboard-graphs.js diff --git a/awx/ui/static/js/services/data-services.js b/awx/ui/static/js/services/_data-services.js similarity index 100% rename from awx/ui/static/js/services/data-services.js rename to awx/ui/static/js/services/_data-services.js