nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'patch-1' of git://github.com/JesseWeinstein/diaspora into JesseWeinstein-patch-1

Browse source
This commit is contained in:
Florian Staudacher 2015-05-01 13:18:46 +02:00
commit 9479be6360
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/helpers/application_helper.rb
View file

@ -26,7 +26,24 @@ module ApplicationHelper
end end
def bookmarklet_url( height = 400, width = 620) def bookmarklet_url( height = 400, width = 620)
"javascript:(function(){f='#{AppConfig.pod_uri.to_s}bookmarklet?url='+encodeURIComponent(window.location.href)+'&title='+encodeURIComponent(document.title)+'&notes='+encodeURIComponent(''+(window.getSelection?window.getSelection():document.getSelection?document.getSelection():document.selection.createRange().text))+'&v=1&';a=function(){if(!window.open(f+'noui=1&jump=doclose','diasporav1','location=yes,links=no,scrollbars=yes,toolbar=no,width=#{width},height=#{height}'))location.href=f+'jump=yes'};if(/Firefox/.test(navigator.userAgent)){setTimeout(a,0)}else{a()}})()" "javascript:(function(){" \
"t=(window.getSelection?window.getSelection():" \
"document.getSelection?document.getSelection():" \
"document.selection.createRange().text);" \
"f='#{AppConfig.pod_uri.to_s}bookmarklet" \
"?content='+encodeURIComponent('##%20'+document.title+" \
"(t!=''?('\n>%20'+t):'')" \
"+'\n\n'+window.location.href)" \
"+'&v=1&';" \
"a=function(){" \
"if(!window.open(f+'noui=1&jump=doclose'," \
"'diasporav1'," \
"'location=yes,links=no,scrollbars=yes,toolbar=no,width=#{width},height=#{height}'))" \
"location.href=f+'jump=yes'};" \
"if(/Firefox/.test(navigator.userAgent)){" \
"setTimeout(a,0)" \
"}else{a()}" \
"})()"
end end
def contacts_link def contacts_link