From aed2b4f661b44a2319b18d719d78af093553b4fd Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Fri, 28 Oct 2011 14:36:10 -0700
Subject: [PATCH] [#263] Update jquery load order and embed noConflict in the
 HTML head directly

---
 app/views/layouts/base.rhtml      | 5 +++--
 public/javascripts/application.js | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 3fa5bd38..2c2a1a6c 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -15,10 +15,11 @@
 <!--[if lte IE 7]><%= stylesheet_link_tag 'ie7', :media => 'all' %><![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.menu_expand.js' %>
+<%= javascript_tag('jQuery.noConflict();') %>
+<%= javascript_heads %>
+<%= stylesheet_link_tag 'jstoolbar' %>
 <%= heads_for_theme %>
 <% heads_for_wiki_formatter %>
 <%= call_hook :view_layouts_base_html_head %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 1c883472..dfd76479 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -372,8 +372,6 @@ Event.observe(window, 'load', hideOnLoad);
 
 /* jQuery code from #263 */
 /* TODO: integrate with existing code and/or refactor */
-jQuery.noConflict();
-
 jQuery(document).ready(function($) {
 
 	// a few constants for animations speeds, etc.