From 9c66f5ee28875181bc4737af6645f23c593f9a72 Mon Sep 17 00:00:00 2001
From: Alex Coles <alex@alexbcoles.com>
Date: Fri, 17 Oct 2014 14:49:17 +0200
Subject: [PATCH] Move angular app requires to openproject-app.js

Signed-off-by: Alex Coles <alex@alexbcoles.com>
---
 .../javascripts/angular/openproject-app.js    | 22 +++++++++++++++++++
 app/assets/javascripts/application.js.erb     | 21 ------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/angular/openproject-app.js b/app/assets/javascripts/angular/openproject-app.js
index f2f891b55a..cd7cf295f7 100644
--- a/app/assets/javascripts/angular/openproject-app.js
+++ b/app/assets/javascripts/angular/openproject-app.js
@@ -26,6 +26,28 @@
 // See doc/COPYRIGHT.rdoc for more details.
 //++
 
+//= require uri.js/src/URI
+//= require uri.js/src/URITemplate
+//= require hyperagent/dist/hyperagent
+
+//= require angular
+//= require angular-animate
+//= require angular-modal
+//= require angular-ui-router
+//= require angular-ui-select2
+//= require angular-ui-select2-sortable
+//= require angular-ui-date/src/date
+//= require angular-sanitize
+//= require angular-truncate
+//= require angular-feature-flags/dist/featureFlags.js
+//= require angular-busy
+
+//= require angular-context-menu
+
+//= require openproject-ui_components/app/assets/javascripts/angular/ui-components-app
+//= require_self
+//= require_tree .
+
 // global
 angular.module('openproject.config', []);
 angular.module('openproject.services', [
diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index b3504d8ae2..25e97c5f06 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -54,30 +54,9 @@
 //= require warn_leaving_unsaved
 //= require openproject_plugins
 //= require versions
-//= require uri.js/src/URI
-//= require uri.js/src/URITemplate
-//= require hyperagent/dist/hyperagent
 //= require_tree ./specific
 
-//= require angular
-//= require angular-animate
-//= require angular-modal
-//= require angular-ui-router
-//= require angular-ui-select2
-//= require angular-ui-select2-sortable
-//= require angular-ui-date/src/date
-//= require angular-sanitize
-//= require angular-truncate
-//= require angular-feature-flags/dist/featureFlags.js
-//= require angular-busy
-
-//= require angular-context-menu
-
-//= require openproject-ui_components/app/assets/javascripts/angular/ui-components-app
 //= require ./angular/openproject-app
-//= require_tree ./angular
-
-
 
 //source: http://stackoverflow.com/questions/8120065/jquery-and-prototype-dont-work-together-with-array-prototype-reverse
 if (typeof []._reverse == 'undefined') {