Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 15:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add target="_blank" for generated links

Browse source 
This causes the links to be opened in a new window/tab.
Existing (rendered) notes are not affected by this.

Fixes #1747
This commit is contained in:
Carsten Otto 2016-01-23 19:19:53 +01:00
parent d1a9e2746b
commit 3327966af1
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/tracks/utils.rb
View file

@ -25,14 +25,17 @@ module Tracks
def self.render_text(text) def self.render_text(text)
rendered = auto_link_message(text) rendered = auto_link_message(text)
rendered = textile(rendered) rendered = textile(rendered)
rendered = helpers.auto_link(rendered, :link => :urls) rendered = helpers.auto_link(rendered, :link => :urls, :html => {:target => '_blank'})
# add onenote and message protocols relaxed_config = Sanitize::Config::RELAXED
config = Sanitize::Config.merge(Sanitize::Config::RELAXED, config = relaxed_config
:protocols => { 'a' => {'href' => Sanitize::Config::RELAXED[:protocols]['a']['href'] + ['onenote', 'message']}}
)
rendered = Sanitize.clean(rendered, config) # add onenote and message protocols, allow a target
a_href_config = relaxed_config[:protocols]['a']['href'] + %w(onenote message)
a_attributes = relaxed_config[:attributes]['a'] + ['target']
config = Sanitize::Config.merge(config, :protocols => {'a' => {'href' => a_href_config}}, :attributes => {'a' => a_attributes})
rendered = Sanitize.fragment(rendered, config)
return rendered.html_safe return rendered.html_safe
end end

15
test/controllers/todos_controller_test.rb
View file

@ -842,11 +842,22 @@ class TodosControllerTest < ActionController::TestCase
# See http://blog.swivel.com/code/2009/06/rails-auto_link-and-certain-query-strings.html # See http://blog.swivel.com/code/2009/06/rails-auto_link-and-certain-query-strings.html
login_as(:admin_user) login_as(:admin_user)
todo = users(:admin_user).todos.first todo = users(:admin_user).todos.first
url = "http://example.com/foo?bar=/baz" url = 'http://example.com/foo?bar=/baz'
todo.notes = "foo #{url} bar" todo.notes = "foo #{url} bar"
todo.save! todo.save!
get :index get :index
assert_select("a[href=#{url}]") assert_select "a[href=#{url}]"
end
def test_link_opened_in_new_window
# issue #1747
login_as(:admin_user)
todo = users(:admin_user).todos.first
url = 'http://example.com/'
todo.notes = "foo #{url} bar"
todo.save!
get :index
assert_select "a[target='_blank']"
end end
def test_format_note_normal def test_format_note_normal