bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge branch 'pull'

Browse source
This commit is contained in:
Friendika 2011-07-25 00:18:11 -07:00
commit 60ff58d7be
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
view/jot-header.tpl
View file

@ -187,8 +187,8 @@ function initEditor(cb){
function jotShare(id) { function jotShare(id) {
$('#like-rotator-' + id).show(); $('#like-rotator-' + id).show();
$.get('share/' + id, function(data) { $.get('share/' + id, function(data) {
if (!editor) $("#profile-jot-text").val("");
initEditor(function(){ initEditor(function(){
tinyMCE.execCommand('mceInsertRawHTML',false,data); tinyMCE.execCommand('mceInsertRawHTML',false,data);
$('#like-rotator-' + id).hide(); $('#like-rotator-' + id).hide();
@ -211,8 +211,11 @@ function initEditor(cb){
if(reply && reply.length) { if(reply && reply.length) {
$('#profile-rotator').show(); $('#profile-rotator').show();
$.get('parse_url?url=' + reply, function(data) { $.get('parse_url?url=' + reply, function(data) {
tinyMCE.execCommand('mceInsertRawHTML',false,data); if (!editor) $("#profile-jot-text").val("");
$('#profile-rotator').hide(); initEditor(function(){
tinyMCE.execCommand('mceInsertRawHTML',false,data);
$('#profile-rotator').hide();
});
}); });
} }
} }

18
view/theme/dispy/jot-header.tpl
View file

@ -209,11 +209,12 @@ function initEditor(cb) {
function jotShare(id) { function jotShare(id) {
$('#like-rotator-' + id).show(); $('#like-rotator-' + id).show();
$.get('share/' + id, function(data) { $.get('share/' + id, function(data) {
initEditor(function(){ if (!editor) $("#profile-jot-text").val("");
tinyMCE.execCommand('mceInsertRawHTML',false,data); initEditor(function(){
$('#like-rotator-' + id).hide(); tinyMCE.execCommand('mceInsertRawHTML',false,data);
$(window).scrollTop(0); $('#like-rotator-' + id).hide();
}) $(window).scrollTop(0);
});
}); });
} }
@ -230,8 +231,11 @@ function initEditor(cb) {
if(reply && reply.length) { if(reply && reply.length) {
$('#profile-rotator').show(); $('#profile-rotator').show();
$.get('parse_url?url=' + reply, function(data) { $.get('parse_url?url=' + reply, function(data) {
tinyMCE.execCommand('mceInsertRawHTML',false,data); if (!editor) $("#profile-jot-text").val("");
$('#profile-rotator').hide(); initEditor(function(){
tinyMCE.execCommand('mceInsertRawHTML',false,data);
$('#profile-rotator').hide();
});
}); });
} }
} }