Resolved issue with instantiating a jQuery function that was not decl…

…ared yet
baphled · Jul 3, 2010 · 776c3b2 · 776c3b2
1 parent e6a8610
commit 776c3b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -17,11 +17,13 @@
   <%= javascript_include_tag "jquery" %>
   <%= javascript_include_tag "jquery-ui" %>
   <%= javascript_include_tag "jquery-icon-animation" %>
-  <%= javascript_include_tag "application" %>
+  <!-- JS Head start -->
   <%= yield :js_head %>
+  <!-- JS Head end -->
   <%= javascript_include_tag "jquery-validate" %>
   <%= javascript_include_tag "jquery.tipsy" %>
   <%= javascript_include_tag "tooltips.js" %>
+  <%= javascript_include_tag "application" %>
   <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
 
   <body class="salad">
@@ -30,7 +32,7 @@
         <%= render :partial => 'layouts/flash', :locals => {:flash => flash} %>
         <%= render :partial => 'layouts/content' %>
         <%= render :partial => 'layouts/sidebar' %>
-				<div id="footer_layout">
+		<div id="footer_layout"></div>
       </div>
       <%= render :partial => 'layouts/footer' %>
   </body>

diff --git a/app/views/layouts/no_sidebar.html.erb b/app/views/layouts/no_sidebar.html.erb
@@ -16,7 +16,6 @@
 
 	<%= javascript_include_tag "jquery" %>
   <%= javascript_include_tag "jquery-ui" %>
-  <%= javascript_include_tag "application" %>
   <%= javascript_include_tag "jquery-icon-animation" %>
   <%= javascript_include_tag "inflection" %>
   <%= javascript_include_tag "jquery.custom.validation" %>
@@ -32,6 +31,7 @@
   <%= javascript_include_tag "tooltips" %>
   <%= javascript_include_tag "pagination" %>
   <%= javascript_include_tag "sortable_list" %>
+  <%= javascript_include_tag "application" %>
   <%= yield :js_head %>
 
   <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
@@ -41,7 +41,7 @@
 	    <%= render :partial => 'layouts/header' %>
 	    <%= render :partial => 'layouts/flash', :locals => {:flash => flash} %>
 	    <%= render :partial => 'layouts/content', :locals => {:content => 'wide'} %>
-			<div id="footer_layout">
+        <div id="footer_layout"></div>
 	  </div>
     <%= render :partial => 'layouts/footer' %>
   </body>