Merge branch 'pull'
This commit is contained in:
commit
60ff58d7be
2 changed files with 17 additions and 10 deletions
|
@ -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,9 +211,12 @@ 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) {
|
||||||
|
if (!editor) $("#profile-jot-text").val("");
|
||||||
|
initEditor(function(){
|
||||||
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
||||||
$('#profile-rotator').hide();
|
$('#profile-rotator').hide();
|
||||||
});
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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) {
|
||||||
|
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();
|
||||||
$(window).scrollTop(0);
|
$(window).scrollTop(0);
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -230,9 +231,12 @@ 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) {
|
||||||
|
if (!editor) $("#profile-jot-text").val("");
|
||||||
|
initEditor(function(){
|
||||||
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
||||||
$('#profile-rotator').hide();
|
$('#profile-rotator').hide();
|
||||||
});
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue