X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2d50a840049e0634ebc548026c41a397747af061..32104684f7fe70bac494ede1f7249a6cf19a63ec:/app/helpers/application_helper.rb?ds=sidebyside diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c8473adfc..bb09f3a49 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -17,26 +17,6 @@ module ApplicationHelper link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall") end - def richtext_area(object_name, method, options = {}) - id = "#{object_name}_#{method}" - type = options.delete(:format) || "markdown" - - tag.div(:id => "#{id}_container", :class => "richtext_container") do - output_buffer << tag.div(:id => "#{id}_content", :class => "richtext_content") do - output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:type => type))) - output_buffer << tag.div("", :id => "#{id}_preview", :class => "richtext_preview richtext text-break") - end - - output_buffer << tag.div(:id => "#{id}_help", :class => "richtext_help") do - output_buffer << render("site/#{type}_help") - output_buffer << tag.div(:class => "buttons") do - output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit deemphasize", :disabled => true) - output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview deemphasize") - end - end - end - end - def dir if dir = params[:dir] dir == "rtl" ? "rtl" : "ltr" @@ -50,7 +30,7 @@ module ApplicationHelper end def friendly_date_ago(date) - tag.span(time_ago_in_words(date, :scope => :'datetime.distance_in_words_ago'), :title => l(date, :format => :friendly)) + tag.span(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly)) end def body_class @@ -78,14 +58,20 @@ module ApplicationHelper end data[:location] = session[:location] if session[:location] - - if oauth_token - data[:token] = oauth_token.token - data[:token_secret] = oauth_token.secret - data[:consumer_key] = oauth_token.client_application.key - data[:consumer_secret] = oauth_token.client_application.secret - end + 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 + rescue StandardError + flash.inspect if Rails.env.development? + end end