Eliminate edit.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index a0ddcf9c2b0b0b14e643f693fcfc4a6298afe8d8..493c03d9161721a1f8eff3184a68e8593e7fd106 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -116,6 +116,14 @@ function escapeHTML(string) {
   });
 }
 
   });
 }
 

+function maximiseMap() {
+  $("#content").addClass("maximised");
+}
+
+function minimiseMap() {
+  $("#content").removeClass("maximised");
+}
+

 /*
  * Forms which have been cached by rails may have the wrong
  * authenticity token, so patch up any forms with the correct
 /*
  * Forms which have been cached by rails may have the wrong
  * authenticity token, so patch up any forms with the correct

diff --git a/app/assets/javascripts/edit.js b/app/assets/javascripts/edit.js
deleted file mode 100644 (file)
index 8800195..0000000
--- a/app/assets/javascripts/edit.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function maximiseMap() {
-  $("#content").addClass("maximised");
-}
-
-function minimiseMap() {
-  $("#content").removeClass("maximised");
-}

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index 030775fe602dde0027f8e8f1f6c4ecfaf5bdb712..ae313e1f263424119711c275207607d4843a824c 100644 (file)
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -8,10 +8,6 @@
     <p><%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %></p>
     <p><%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %></p>
   <% else %>
     <p><%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %></p>
     <p><%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %></p>
   <% else %>

-    <% content_for :head do %>
-      <%= javascript_include_tag "edit" %>
-    <% end %>
-

     <%= render :partial => preferred_editor %>
   <% end %>
 <% end %>
     <%= render :partial => preferred_editor %>
   <% end %>
 <% end %>

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 74cdcee41d45b823e06db68e5c401077ebd5d3fb..bbb1c55ef1d7a984b853a033906b3c4fa8a7775e 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -69,7 +69,7 @@ OpenStreetMap::Application.configure do
 
   # Precompile additional assets.
   # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 
   # Precompile additional assets.
   # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.

-  config.assets.precompile += %w( index.js edit.js browse.js changeset.js welcome.js )
+  config.assets.precompile += %w( index.js browse.js changeset.js welcome.js )

   config.assets.precompile += %w( user.js diary_entry.js pngfix.js swfobject.js )
   config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
   config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
   config.assets.precompile += %w( user.js diary_entry.js pngfix.js swfobject.js )
   config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
   config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )