diff options
Diffstat (limited to 'view/jot-header.tpl')
| -rw-r--r-- | view/jot-header.tpl | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 1a9016f5d..cdef9ef83 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -82,7 +82,7 @@ function initEditor(cb){ ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; $("#profile-jot-text-loading").hide(); - $("#profile-jot-submit-wrapper").show(); + $(".jothidden").show(); if (typeof cb!="undefined") cb(); }); @@ -99,6 +99,12 @@ function initEditor(cb){ } } +function enableOnUser(){ + if (editor) return; + $(this).val(""); + initEditor(); +} + </script> <script type="text/javascript" src="js/ajaxupload.js" ></script> <script> @@ -107,6 +113,11 @@ function initEditor(cb){ $(document).ready(function() { +<<<<<<< HEAD + /* enable tinymce on focus and click */ + $("#profile-jot-text").focus(enableOnUser); + $("#profile-jot-text").click(enableOnUser); +======= /* enable tinymce on focus */ $("#profile-jot-text").focus(function(){ if (editor) return; @@ -137,6 +148,7 @@ function initEditor(cb){ $("#jot-title").show(); $("#jot-title").focus(); }); +>>>>>>> friendica/master var uploader = new window.AjaxUpload( 'wall-image-upload', |