Merge pull request #591 from mbarrien/jquery-require

undefine "define" to avoid requirejs conflict

1 files changed, 7 insertions, 0 deletions

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 115e627..b8f72a8 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -3,12 +3,19 @@
 @media print { #djDebug {display:none;}}
 </style>
 <link rel="stylesheet" href="{% static 'debug_toolbar/css/toolbar.css' %}" type="text/css" />
+<script>
+	var _define = window.define;
+	window.define = undefined;
+</script>
 {% if toolbar.config.JQUERY_URL %}
 <script src="{{ toolbar.config.JQUERY_URL }}"></script>
 <script>var djdt = {jQuery: jQuery.noConflict(true)};</script>
 {% else %}
 <script>var djdt = {jQuery: jQuery};</script>
 {% endif %}
+<script>
+	window.define = _define;
+</script>
 <script src="{% static 'debug_toolbar/js/toolbar.js' %}"></script>
 <div id="djDebug" style="display:none;" dir="ltr"
      data-store-id="{{ toolbar.store_id }}" data-render-panel-url="{% url 'djdt:render_panel' %}"