X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/39b60219fe37d1e3f94555a053895adc1eee179c..e430bc0f7f90d2765aa0218093e518d21b9173b1:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5f36e262b..db8b51f5c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -24,7 +24,7 @@ module ApplicationHelper 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") + 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 @@ -79,11 +79,11 @@ module ApplicationHelper 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 + 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