Merge remote-tracking branch 'upstream/pull/3285'

[rails.git] / app / helpers / application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e10650ada1fa3cde95956725f5e679f146446156..c9f165d528af8f7d32bd6ee94e03035e02d3a2e8 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,49 +1,75 @@
 module ApplicationHelper
-  def htmlize(text)
-    return auto_link(sanitize(simple_format(text)), :link => :urls, :html => { :rel => "nofollow" })
-  end
+  require "rexml/document"
 
-  def html_escape_unicode(text)
-    chars = ActiveSupport::Multibyte::Chars.u_unpack(text).map do |c|
-      c < 127 ? c.chr : "&##{c.to_s};"
+  def linkify(text)
+    if text.html_safe?
+      Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe
+    else
+      Rinku.auto_link(ERB::Util.h(text), :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe
     end
+  end
 
-    return chars.join("")
+  def rss_link_to(args = {})
+    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall")
   end
 
-  def rss_link_to(*args)
-    return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
+  def atom_link_to(args = {})
+    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall")
   end
 
-  def atom_link_to(*args)
-    return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
+  def dir
+    if dir = params[:dir]
+      dir == "rtl" ? "rtl" : "ltr"
+    else
+      I18n.t("html.dir")
+    end
   end
 
-  def javascript_strings
-    js = ""
+  def friendly_date(date)
+    tag.span(time_ago_in_words(date), :title => l(date, :format => :friendly))
+  end
 
-    js << "<script type='text/javascript'>\n"
-    js << "i18n_strings = new Array();\n"
-    js << javascript_strings_for_key("javascripts")
-    js << "</script>\n"
+  def friendly_date_ago(date)
+    tag.span(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly))
+  end
 
-    return js
+  def body_class
+    if content_for? :body_class
+      content_for :body_class
+    else
+      "#{params[:controller]} #{params[:controller]}-#{params[:action]}"
+    end
   end
 
-private
+  def current_page_class(path)
+    :current if current_page?(path)
+  end
 
-  def javascript_strings_for_key(key)
-    js = ""
-    value = t(key, :locale => "en")
+  def application_data
+    data = {
+      :locale => I18n.locale,
+      :preferred_editor => preferred_editor
+    }
 
-    if value.is_a?(String)
-      js << "i18n_strings['#{key}'] = '" << escape_javascript(t(key)) << "';\n"
-    else
-      value.each_key do |k|
-        js << javascript_strings_for_key("#{key}.#{k}")
-      end
+    if current_user
+      data[:user] = current_user.id.to_json
+
+      data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } unless current_user.home_lon.nil? || current_user.home_lat.nil?
     end
 
-    return js
+    data[:location] = session[:location] if session[:location]
+    data[:oauth_token] = oauth_token.token if oauth_token
+
+    data
+  end
+
+  # If the flash is a hash, then it will be a partial with a hash of locals, so we can call `render` on that
+  # This allows us to render html into a flash message in a safe manner.
+  def render_flash(flash)
+    if flash.is_a?(Hash)
+      render flash.with_indifferent_access
+    else
+      flash
+    end
   end
 end