diff options
| author | Michael Barrientos | 2014-04-29 14:32:32 -0700 | 
|---|---|---|
| committer | Michael Barrientos | 2014-04-29 14:32:32 -0700 | 
| commit | a48b7f90c4e47348f646c1827cc0800c097c0902 (patch) | |
| tree | 88f494e25903e9b5a8a1019e5a423bbcd2920dd2 | |
| parent | be12fc41dc841f8e35823dab8748c8757887a368 (diff) | |
| download | django-debug-toolbar-a48b7f90c4e47348f646c1827cc0800c097c0902.tar.bz2 | |
undefine "define" to avoid requirejs conflict
| -rw-r--r-- | debug_toolbar/templates/debug_toolbar/base.html | 7 | 
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 6bc017a..617b020 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' %}" | 
