Fixing jquery conflicts

Sergio Oliveira
1 parent 27dbb2ab
Showing 3 changed files with 8 additions and 5 deletions Show diff stats
src/proxy/diazo/jenkins.xml
src/templates/base.html
src/tz/templates/tz/set_utc_offset.html
@@ -3,9 +3,12 @@
     xmlns:css="http://namespaces.plone.org/diazo/css"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <drop css:theme="script[data-framework='jquery']" />
     <replace css:theme="#jenkins-css" content="//head/link" />
     <replace css:theme="#jenkins-js" content="//head/script" />
     <before css:theme-children="#main-content" css:content="#main-table" />
+    <after theme-children="/html/head">
+        <script>jQuery.noConflict();</script>
+    </after>
+
 </rules>
@@ -22,9 +22,9 @@
     <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css"
                                 type="text/css" media="screen" />
-    <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js" data-framework="jquery"></script>
-    <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js" data-framework="jquery"></script>
-    <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js" data-framework="jquery"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js"></script>
     <script src="{{ STATIC_URL }}third-party/bootstrap/js/bootstrap.min.js"></script>
     {% block head_js %}{% endblock %}
 <script type="text/javascript">
   var date = new Date();
-  $.cookie('utc_offset', date.getTimezoneOffset(), { path: '/' });
+  jQuery.cookie('utc_offset', date.getTimezoneOffset(), { path: '/' });
 </script>
1	<script type="text/javascript">	1	<script type="text/javascript">
2	var date = new Date();	2	var date = new Date();
3	- $.cookie('utc_offset', date.getTimezoneOffset(), { path: '/' });	3	+ jQuery.cookie('utc_offset', date.getTimezoneOffset(), { path: '/' });
4	</script>	4	</script>