From fcd8b0fa8fdf683370f788011d7da116a3319628 Mon Sep 17 00:00:00 2001
From: Sebastian Schuster <s.schuster@finn.de>
Date: Fri, 7 Jun 2013 15:18:34 +0200
Subject: [PATCH] Removed custom way of loading dependant javascript files upon
 load and fixed order of assets to match the custom order in manifest file

---
 .../javascripts/reporting_engine/reporting.js | 24 -------------------
 .../reporting_engine/reporting_engine.js      |  8 +++----
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/lib/assets/javascripts/reporting_engine/reporting.js b/lib/assets/javascripts/reporting_engine/reporting.js
index 8bb67904ce..91050e0df5 100644
--- a/lib/assets/javascripts/reporting_engine/reporting.js
+++ b/lib/assets/javascripts/reporting_engine/reporting.js
@@ -2,22 +2,6 @@
 /*global window, $, $$, Reporting, Element */
 
 window.Reporting = {
-  source: ($$("head")[0].select("script[src*='reporting.js']")[0].src),
-
-  require: function (libraryName) {
-    var jsName = Reporting.source.replace("reporting.js", "reporting/" + libraryName + ".js");
-    try {
-      // inserting via DOM fails in Safari 2.0, so brute force approach
-      document.write('<script type="text/javascript" src="' + jsName + '"><\/script>');
-    } catch (e) {
-      // for xhtml+xml served content, fall back to DOM methods
-      var script = document.createElement('script');
-      script.type = 'text/javascript';
-      script.src = jsName;
-      document.getElementsByTagName('head')[0].appendChild(script);
-    }
-  },
-
   onload: function (func) {
     document.observe("dom:loaded", func);
   },
@@ -62,11 +46,3 @@ window.Reporting = {
     }
   }
 };
-
-Reporting.require("filters");
-Reporting.require("group_bys");
-Reporting.require("restore_query");
-Reporting.require("controls");
-Reporting.require("prototype_progress_bar");
-Reporting.require("progressbar");
-
diff --git a/lib/assets/javascripts/reporting_engine/reporting_engine.js b/lib/assets/javascripts/reporting_engine/reporting_engine.js
index 706cc83dc2..13f9974966 100644
--- a/lib/assets/javascripts/reporting_engine/reporting_engine.js
+++ b/lib/assets/javascripts/reporting_engine/reporting_engine.js
@@ -4,9 +4,9 @@
 //= require reporting_engine/cordinc_tooltip
 //= require reporting_engine/reporting/lang/reporting-de
 //= require reporting_engine/reporting/lang/reporting-en
-//= require reporting_engine/reporting/prototype_progress_bar
-//= require reporting_engine/reporting/controls
+//= require reporting_engine/reporting/filters
 //= require reporting_engine/reporting/group_bys
-//= require reporting_engine/reporting/progressbar
 //= require reporting_engine/reporting/restore_query
-//= require reporting_engine/reporting/filters
\ No newline at end of file
+//= require reporting_engine/reporting/controls
+//= require reporting_engine/reporting/prototype_progress_bar
+//= require reporting_engine/reporting/progressbar
\ No newline at end of file