From c8308f00325f4ad36c41d0b460511115b09c143b Mon Sep 17 00:00:00 2001
From: Thomas Bouron <thomas.bouron@cloudsoftcorp.com>
Date: Fri, 18 Mar 2016 14:17:43 +0000
Subject: [PATCH] Move jQuery code inside a closure managed by require

---
 src/main/webapp/assets/js/config.js | 13 -------------
 src/main/webapp/assets/js/router.js | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/assets/js/config.js b/src/main/webapp/assets/js/config.js
index 55c227556..5a020807f 100644
--- a/src/main/webapp/assets/js/config.js
+++ b/src/main/webapp/assets/js/config.js
@@ -103,16 +103,3 @@ require([
     new Router().startBrooklynGui();
 });
 
-/*
- * Prepend a base URL to REST API calls
- */
-$.ajaxSetup({
-    beforeSend: function(jqXHR, settings) {
-//        var baseURL = "/api/brooklyn/";
-        var baseURL = "";
-
-        if (baseURL && settings.url.startsWith("/v1")) {
-            settings.url = (baseURL + settings.url).replace("//", "/");
-        }
-    }
-});
diff --git a/src/main/webapp/assets/js/router.js b/src/main/webapp/assets/js/router.js
index 26722ac2c..d26bec2c5 100644
--- a/src/main/webapp/assets/js/router.js
+++ b/src/main/webapp/assets/js/router.js
@@ -253,5 +253,19 @@ define([
         }
     });
 
+    /*
+     * Prepend a base URL to REST API calls
+     */
+    $.ajaxSetup({
+        beforeSend: function(jqXHR, settings) {
+            // var baseURL = "/api/brooklyn/";
+            var baseURL = "";
+
+            if (baseURL && settings.url.startsWith("/v1")) {
+                settings.url = (baseURL + settings.url).replace("//", "/");
+            }
+        }
+    });
+
     return Router
 })