Move some javascript from the layout to application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e40465f06e0d814607ffaeec433553a5b6327635..e02949f5867f8624bb8d68e63447dc5c6afc45b7 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -254,3 +254,20 @@ $(document).ready(function () {
   $(".richtext_doedit").click(editRichtext);
   $(".richtext_dopreview").click(previewRichtext);
 });
   $(".richtext_doedit").click(editRichtext);
   $(".richtext_dopreview").click(previewRichtext);
 });

+
+/*
+ * Forms which have been cached by rails may have he wrong
+ * authenticity token, so patch up any forms with the correct
+ * token taken from the page header.
+ */
+$(document).ready(function () {
+  var auth_token = $("meta[name=csrf-token]").attr("content");
+  $("form input[name=authenticity_token]").val(auth_token);
+});
+
+/*
+ * Enable auto expansion for all text areas
+ */
+$(document).ready(function () {
+  $("textarea").autoGrow();
+});

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 0bff666565ad8126f0b0c9726ff1e214edaf6c3a..5a93608759491672941a9079df042a0cbf78d3ab 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -143,15 +143,6 @@
       </div>
     </div>
 
       </div>
     </div>
 

-    <script type="text/javascript">
-    $(document).ready(function () {
-      var auth_token = $("meta[name=csrf-token]").attr("content");
-      $("form input[name=authenticity_token]").val(auth_token);
-
-      $("textarea").autoGrow();
-    });
-    </script>
-

     <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
     <%= render :partial => "layouts/piwik" %>
     <% end -%>
     <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
     <%= render :partial => "layouts/piwik" %>
     <% end -%>