Merge globals.js.erb and params.js

[rails.git] / app / assets / javascripts / globals.js.erb

diff --git a/app/assets/javascripts/globals.js.erb b/app/assets/javascripts/globals.js.erb
deleted file mode 100644 (file)
index 3c3bd92..0000000
--- a/app/assets/javascripts/globals.js.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-OSM = {
-<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %>
-  PIWIK_LOCATION:   <%= PIWIK_LOCATION.to_json %>,
-  PIWIK_SITE:       <%= PIWIK_SITE.to_json %>,
-<% end %>
-  MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>,
-  SERVER_URL:       <%= SERVER_URL.to_json %>,
-  API_VERSION:      <%= API_VERSION.to_json %>
-};