X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f2d13c075660efb9582d7fb600bd6798d7a382ca..95abc14b305f03de27352a252a451d1e0b200a4d:/app/helpers/application_helper.rb?ds=sidebyside

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5266bf633..3d0a97243 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,5 +1,5 @@
 module ApplicationHelper
-  require 'rexml/document'
+  require "rexml/document"
 
   def linkify(text)
     if text.html_safe?
@@ -10,11 +10,11 @@ module ApplicationHelper
   end
 
   def rss_link_to(*args)
-    return link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
+    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall")
   end
 
   def atom_link_to(*args)
-    return link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
+    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall")
   end
 
   def style_rules
@@ -25,10 +25,10 @@ module ApplicationHelper
     css << ".hide_if_logged_in { display: none !important }" if @user
     css << ".hide_if_user_#{@user.id} { display: none !important }" if @user
     css << ".show_if_user_#{@user.id} { display: inline !important }" if @user
-    css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator?
-    css << ".hide_unless_moderator { display: none !important }" unless @user and @user.moderator?
+    css << ".hide_unless_administrator { display: none !important }" unless @user && @user.administrator?
+    css << ".hide_unless_moderator { display: none !important }" unless @user && @user.moderator?
 
-    return content_tag(:style, css, :type => "text/css")
+    content_tag(:style, css, :type => "text/css")
   end
 
   def if_logged_in(tag = :div, &block)
@@ -58,7 +58,7 @@ module ApplicationHelper
   end
 
   def richtext_area(object_name, method, options = {})
-    id = "#{object_name.to_s}_#{method.to_s}"
+    id = "#{object_name}_#{method}"
     format = options.delete(:format) || "markdown"
 
     content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do
@@ -100,4 +100,30 @@ module ApplicationHelper
   def current_page_class(path)
     :current if current_page?(path)
   end
+
+  def application_data
+    data = {
+      :locale => I18n.locale,
+      :preferred_editor => preferred_editor
+    }
+
+    if @user
+      data[:user] = @user.id.to_json
+
+      unless @user.home_lon.nil? || @user.home_lat.nil?
+        data[:user_home] = { :lat => @user.home_lat, :lon => @user.home_lon }
+      end
+    end
+
+    data[:location] = session[:location] if session[:location]
+
+    if @oauth
+      data[:token] = @oauth.token
+      data[:token_secret] = @oauth.secret
+      data[:consumer_key] = @oauth.client_application.key
+      data[:consumer_secret] = @oauth.client_application.secret
+    end
+
+    data
+  end
 end