diff options
author | Craig Andrews <candrews@integralblue.com> | 2009-09-24 17:15:54 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2009-09-24 17:15:54 -0400 |
commit | 49bce941a9aae495ee7221bd367791227487b458 (patch) | |
tree | 91858ee586473045158f6bb539e26af8168ecd84 /doc-src/bookmarklet | |
parent | 3d30ad83f881a69d76b57a9af051fef308644987 (diff) | |
parent | 5323956e388ebc2e4dfa1a5193aa670c96fff027 (diff) |
Merge remote branch 'statusnet/0.8.x' into 0.9.x
Conflicts:
EVENTS.txt
actions/requesttoken.php
classes/File.php
install.php
lib/action.php
lib/noticeform.php
Diffstat (limited to 'doc-src/bookmarklet')
-rw-r--r-- | doc-src/bookmarklet | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/doc-src/bookmarklet b/doc-src/bookmarklet index 6cd2c08f9..e5ded7702 100644 --- a/doc-src/bookmarklet +++ b/doc-src/bookmarklet @@ -2,6 +2,4 @@ A bookmarklet is a small piece of javascript code used as a bookmark. This one w Drag-and-drop the following link to your bookmarks bar or right-click it and add it to your browser favorites to keep it handy. -<MTMarkdownOptions output='raw'> -<a href="javascript:var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=newnotice',l=d.location,e=encodeURIComponent,g=f+'&status_textarea=%22'+((e(s))?e(s):e(document.title))+'%22 from '+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=800,height=570')){l.href=g;}}a();void(0);">Post to %%site.name%%</a> -</MTMarkdownOptions> +<a href="javascript:var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=newnotice',l=d.location,e=encodeURIComponent,g=f+'&status_textarea=%22'+((e(s))?e(s):e(document.title))+'%22 from '+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=800,height=570')){l.href=g;}}a();void(0);">Post to %%site.name%%</a> |