aboutsummaryrefslogtreecommitdiffstats
path: root/view/jot-header.tpl
diff options
context:
space:
mode:
authorFabio Comuni <fabio@krik.localdomain>2012-01-02 15:32:37 +0100
committerFabio Comuni <fabio@krik.localdomain>2012-01-02 15:32:37 +0100
commitbe2fd56aae51ee02b6e40dedd4383e1ebddc752e (patch)
tree1795fb34e182f51b6adc4f05204cea45da4bca69 /view/jot-header.tpl
parent4b095665791424bd2f5c4c494a2d14ec6c07aeba (diff)
parent0dce36bdbce7482329105e2c1ef4f3c8b3043803 (diff)
downloadvolse-hubzilla-be2fd56aae51ee02b6e40dedd4383e1ebddc752e.tar.gz
volse-hubzilla-be2fd56aae51ee02b6e40dedd4383e1ebddc752e.tar.bz2
volse-hubzilla-be2fd56aae51ee02b6e40dedd4383e1ebddc752e.zip
Merge branch 'master' of github.com:fabrixxm/friendica
Diffstat (limited to 'view/jot-header.tpl')
-rw-r--r--view/jot-header.tpl18
1 files changed, 10 insertions, 8 deletions
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index ecfed6c42..4186ef78e 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -81,7 +81,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();
});
@@ -98,19 +98,21 @@ function initEditor(cb){
}
}
+function enableOnUser(){
+ if (editor) return;
+ $(this).val("");
+ initEditor();
+}
+
</script>
<script type="text/javascript" src="js/ajaxupload.js" ></script>
<script>
var ispublic = '$ispublic';
$(document).ready(function() {
- /* enable tinymce on focus */
- $("#profile-jot-text").focus(function(){
- if (editor) return;
- $(this).val("");
- initEditor();
- });
-
+ /* enable tinymce on focus and click */
+ $("#profile-jot-text").focus(enableOnUser);
+ $("#profile-jot-text").click(enableOnUser);
var uploader = new window.AjaxUpload(
'wall-image-upload',