diff options
| author | zottel <github@zottel.net> | 2012-03-17 01:49:17 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-17 01:49:17 +0100 |
| commit | c56e3c5dd4bcbb949282fd3b4c065ccfd4673726 (patch) | |
| tree | c4574eae6f2aaf68c50ccc1022944e0e1c45760b /view/theme/dispy/jot-header.tpl | |
| parent | ea4c806c5c3adacb6ef585de657e5f34c2e24c98 (diff) | |
| parent | 8af36b92bb3a78235f5741c764d034dc66b959b2 (diff) | |
| download | volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.tar.gz volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.tar.bz2 volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy/jot-header.tpl')
| -rw-r--r-- | view/theme/dispy/jot-header.tpl | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 43dcdbb84..4c8f59d79 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -114,6 +114,7 @@ function enableOnUser(){ $(this).val(""); initEditor(); } + </script> <script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script> <script type="text/javascript"> @@ -121,6 +122,7 @@ function enableOnUser(){ var addtitle = '$addtitle'; $(document).ready(function() { + /* enable tinymce on focus and click */ $("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").click(enableOnUser); @@ -261,6 +263,18 @@ function enableOnUser(){ } } + function itemFiler(id) { + reply = prompt("$fileas"); + if(reply && reply.length) { + commentBusy = true; + $('body').css('cursor', 'wait'); + $.get('filer/' + id + '?term=' + reply); + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,3000); + liking = 1; + } + } + function jotClearLocation() { $('#jot-coord').val(''); $('#profile-nolocation-wrapper').hide(); |