From 8b124a3d2b8ded37a156649c1c75675de4de00ea Mon Sep 17 00:00:00 2001
From: Pyco <emunet@hafner.me>
Date: Tue, 29 Dec 2015 14:40:05 +0100
Subject: [PATCH] Resolve conflict when using require js

That's how django debug toolbar does it.
---
 talkback/templates/talkback/feedback_form.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/talkback/templates/talkback/feedback_form.html b/talkback/templates/talkback/feedback_form.html
index aa92545..5117f85 100644
--- a/talkback/templates/talkback/feedback_form.html
+++ b/talkback/templates/talkback/feedback_form.html
@@ -30,9 +30,12 @@
 	</div>
 </div>
 {% if config.JQUERY_URL %}
+	<script type="text/javascript">
+		var _zf_define_backup = window.define; window.define = undefined;
+	</script>
 	<script type="text/javascript" src="{{ config.JQUERY_URL }}"></script>
 	<script type="text/javascript">
-		window.zf = {'jQuery': jQuery.noConflict(true)};
+		window.zf = {jQuery: jQuery.noConflict(true)}; window.define = _zf_define_backup;
 	</script>
 {% endif %}
 <script type="text/javascript" src="{% static "talkback/script.js"%}"></script>