aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/jot-header.tpl
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-07 20:03:58 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-07 20:03:58 +0200
commite036434b8a2dbd8594c0ac5ac7233f4700e4e475 (patch)
tree0d37048ec06d603e45fd9852f208478a89e84476 /view/theme/dispy/jot-header.tpl
parent0e8b2092a0c30a8eb898a8f0e7130251300e8d47 (diff)
parentc1b2e90e3720961c280f6378e48fda7bad7c3ad0 (diff)
downloadvolse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.tar.gz
volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.tar.bz2
volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'view/theme/dispy/jot-header.tpl')
-rw-r--r--view/theme/dispy/jot-header.tpl11
1 files changed, 11 insertions, 0 deletions
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 245957808..eab3af700 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -81,6 +81,17 @@ tinyMCE.init({
}
}
);
+ var file_uploader = new window.AjaxUpload(
+ 'wall-file-upload',
+ { action: 'wall_attach/$nickname',
+ name: 'userfile',
+ onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+ onComplete: function(file,response) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,response);
+ $('#profile-rotator').hide();
+ }
+ }
+ );
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {