aboutsummaryrefslogtreecommitdiffstats
path: root/view/jot-header.tpl
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-07-25 00:18:11 -0700
committerFriendika <info@friendika.com>2011-07-25 00:18:11 -0700
commit60ff58d7be6300ea15c77897df54818f5f5bee64 (patch)
tree5cd98d0eb9f3c34023ed724220b3010deb2f63fc /view/jot-header.tpl
parentf1115a103158fc22fd8983cb767f811f64810bc2 (diff)
parent9f34f587eafd9ede810ee29237341add4977dff5 (diff)
downloadvolse-hubzilla-60ff58d7be6300ea15c77897df54818f5f5bee64.tar.gz
volse-hubzilla-60ff58d7be6300ea15c77897df54818f5f5bee64.tar.bz2
volse-hubzilla-60ff58d7be6300ea15c77897df54818f5f5bee64.zip
Merge branch 'pull'
Diffstat (limited to 'view/jot-header.tpl')
-rw-r--r--view/jot-header.tpl9
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();
+ });
});
}
}