From baa2a59f4c2adbe4d3aed525ba9b5b53465a819a Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Fri, 14 Apr 2017 00:13:25 -0600
Subject: [PATCH] Fix ace editor not working

---
 public/src/admin/admin.js                | 6 ++++++
 public/src/admin/appearance/customise.js | 1 -
 public/src/admin/settings/email.js       | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index 7ec41a553b..0b6867b81c 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -231,4 +231,10 @@
 			});
 		});
 	}
+
+	// tell ace to use the right paths when requiring modules
+	require(['ace/ace'], function (ace) {
+		ace.config.set('packaged', true);
+		ace.config.set('basePath', config.relative_path + '/assets/src/modules/ace/');
+	});
 }());
diff --git a/public/src/admin/appearance/customise.js b/public/src/admin/appearance/customise.js
index a8fc5282cd..268d8480af 100644
--- a/public/src/admin/appearance/customise.js
+++ b/public/src/admin/appearance/customise.js
@@ -1,6 +1,5 @@
 'use strict';
 
-
 define('admin/appearance/customise', ['admin/settings', 'ace/ace'], function (Settings, ace) {
 	var Customise = {};
 
diff --git a/public/src/admin/settings/email.js b/public/src/admin/settings/email.js
index ca454ab1ba..d25fa05c30 100644
--- a/public/src/admin/settings/email.js
+++ b/public/src/admin/settings/email.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('admin/settings/email', ['admin/settings', 'ace/ace'], function (ace) {
+define('admin/settings/email', ['ace/ace', 'admin/settings'], function (ace) {
 	var module = {};
 	var emailEditor;