diff options
author | fabrixxm <fabrix.xm@gmail.com> | 2011-07-24 23:53:37 -0700 |
---|---|---|
committer | fabrixxm <fabrix.xm@gmail.com> | 2011-07-24 23:53:37 -0700 |
commit | 9f34f587eafd9ede810ee29237341add4977dff5 (patch) | |
tree | 5aaddac06efb8c1f08354b6e995988524817c953 /view/jot-header.tpl | |
parent | 57653f4fdff0e3ad3fa59c469a526b744dc22264 (diff) | |
parent | 363c4c57986706f6fadac33717759c5ab3ed0b29 (diff) | |
download | volse-hubzilla-9f34f587eafd9ede810ee29237341add4977dff5.tar.gz volse-hubzilla-9f34f587eafd9ede810ee29237341add4977dff5.tar.bz2 volse-hubzilla-9f34f587eafd9ede810ee29237341add4977dff5.zip |
Merge pull request #148 from fabrixxm/newacl
Remove "share" greyed text in jot editor when user reshare an item
Diffstat (limited to 'view/jot-header.tpl')
-rw-r--r-- | view/jot-header.tpl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 8e671a0b3..795267ee3 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -187,8 +187,8 @@ function initEditor(cb){ function jotShare(id) { $('#like-rotator-' + id).show(); - $.get('share/' + id, function(data) { + if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ tinyMCE.execCommand('mceInsertRawHTML',false,data); $('#like-rotator-' + id).hide(); @@ -211,8 +211,11 @@ function initEditor(cb){ if(reply && reply.length) { $('#profile-rotator').show(); $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); + if (!editor) $("#profile-jot-text").val(""); + initEditor(function(){ + tinyMCE.execCommand('mceInsertRawHTML',false,data); + $('#profile-rotator').hide(); + }); }); } } |