diff --git a/mod/editpost.php b/mod/editpost.php index cd0bbf223..c396ee44b 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -80,7 +80,9 @@ function editpost_content(&$a) { call_hooks('jot_tool', $jotplugins); call_hooks('jot_networks', $jotnets); - $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + + //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + $o .= replace_macros($tpl,array( '$return_path' => $_SESSION['return_url'], @@ -110,10 +112,10 @@ function editpost_content(&$a) { '$lockstate' => $lockstate, '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb), '$bang' => (($group) ? '!' : ''), - '$profile_uid' => $_SESSION['uid'] + '$profile_uid' => $_SESSION['uid'], + '$jotplugins' => $jotplugins, )); - return $o; } diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 7e7e393ac..061f6a71d 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -1,68 +1,79 @@ @@ -70,11 +81,13 @@ tinyMCE.init({ var ispublic = '$ispublic'; $(document).ready(function() { - $("#profile-jot-acl-wrapper").hide(); - $("a#jot-perms-icon").fancybox({ - 'transitionIn' : 'none', - 'transitionOut' : 'none' - }); + /* enable tinymce on focus */ + $("#profile-jot-text").focus(function(){ + if (editor) return; + $(this).val(""); + initEditor(); + }); + var uploader = new window.AjaxUpload( 'wall-image-upload', diff --git a/view/jot.tpl b/view/jot.tpl index 43c20b90e..aa9892cbb 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -15,10 +15,12 @@ - + + + {{ if $content }}{{ endif }} -
+