Commits

David Jean Louis  committed 70ad82a

removed jQuery.noConflict() it breaks third party apps like django-cms

  • Participants
  • Parent commits 334cccf

Comments (0)

Files changed (2)

File admin_tools/dashboard/templates/dashboard/dashboard.html

     }
 </script>
 <script type="text/javascript" charset="utf-8">
-    jQuery.noConflict();
     // load jquery ui if it's not loaded yet
     if (typeof jQuery.ui == 'undefined') {
         var script_url = '{{ media_url }}/admin_tools/js/jquery/jquery-ui-1.8rc1.custom.min.js';

File admin_tools/menu/templates/menu/menu.html

     }
 </script>
 <script type="text/javascript" charset="utf-8">
-    jQuery.noConflict();
     // load json if it's not loaded yet
     if (typeof JSON == 'undefined') {
         var script_url = '{{ media_url }}/admin_tools/js/json.min.js';