Merge pull request #144 from fabrixxm/newacl
fix "resend" function when editor is disabled
This commit is contained in:
commit
4e93c742d5
|
@ -4,7 +4,8 @@
|
||||||
var editor=false;
|
var editor=false;
|
||||||
var textlen = 0;
|
var textlen = 0;
|
||||||
|
|
||||||
function initEditor(){
|
function initEditor(cb){
|
||||||
|
if (editor==false){
|
||||||
$("#profile-jot-text-loading").show();
|
$("#profile-jot-text-loading").show();
|
||||||
tinyMCE.init({
|
tinyMCE.init({
|
||||||
theme : "advanced",
|
theme : "advanced",
|
||||||
|
@ -61,18 +62,20 @@ function initEditor(){
|
||||||
ed.pasteAsPlainText = true;
|
ed.pasteAsPlainText = true;
|
||||||
$("#profile-jot-text-loading").hide();
|
$("#profile-jot-text-loading").hide();
|
||||||
$("#profile-jot-submit-wrapper").show();
|
$("#profile-jot-submit-wrapper").show();
|
||||||
|
if (typeof cb!="undefined") cb();
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
editor = true;
|
editor = true;
|
||||||
|
|
||||||
// setup acl popup
|
// setup acl popup
|
||||||
$("#profile-jot-acl-wrapper").hide();
|
|
||||||
$("a#jot-perms-icon").fancybox({
|
$("a#jot-perms-icon").fancybox({
|
||||||
'transitionIn' : 'none',
|
'transitionIn' : 'none',
|
||||||
'transitionOut' : 'none'
|
'transitionOut' : 'none'
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
if (typeof cb!="undefined") cb();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
@ -181,13 +184,18 @@ function initEditor(){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
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(){
|
||||||
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
tinyMCE.execCommand('mceInsertRawHTML',false,data);
|
||||||
$('#like-rotator-' + id).hide();
|
$('#like-rotator-' + id).hide();
|
||||||
$(window).scrollTop(0);
|
$(window).scrollTop(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function linkdropper(event) {
|
function linkdropper(event) {
|
||||||
|
|
Loading…
Reference in a new issue