kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[#263] Update jquery load order and embed noConflict in the HTML head directly

This commit is contained in:
Eric Davis 2011-10-28 14:36:10 -07:00
parent d99bc8a066
commit aed2b4f661
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/layouts/base.rhtml
View File

@ -15,10 +15,11 @@
<!--[if lte IE 7]><%= stylesheet_link_tag 'ie7', :media => 'all' %><![endif]--> <!--[if lte IE 7]><%= stylesheet_link_tag 'ie7', :media => 'all' %><![endif]-->
<!--[if gte IE 8]><![endif]--> <!--[if gte IE 8]><![endif]-->
<%= javascript_heads %>
<%= stylesheet_link_tag 'jstoolbar' %>
<%= javascript_include_tag 'jquery.1.3.2.min.js' %> <%= javascript_include_tag 'jquery.1.3.2.min.js' %>
<%= javascript_include_tag 'jquery.menu_expand.js' %> <%= javascript_include_tag 'jquery.menu_expand.js' %>
<%= javascript_tag('jQuery.noConflict();') %>
<%= javascript_heads %>
<%= stylesheet_link_tag 'jstoolbar' %>
<%= heads_for_theme %> <%= heads_for_theme %>
<% heads_for_wiki_formatter %> <% heads_for_wiki_formatter %>
<%= call_hook :view_layouts_base_html_head %> <%= call_hook :view_layouts_base_html_head %>

2
public/javascripts/application.js
View File

@ -372,8 +372,6 @@ Event.observe(window, 'load', hideOnLoad);
/* jQuery code from #263 */ /* jQuery code from #263 */
/* TODO: integrate with existing code and/or refactor */ /* TODO: integrate with existing code and/or refactor */
jQuery.noConflict();
jQuery(document).ready(function($) { jQuery(document).ready(function($) {
// a few constants for animations speeds, etc. // a few constants for animations speeds, etc.