Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / view / jot-header.tpl

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 0fcd1e42fec1e74b6c1a6e5531abc71eab87206d..77e5bc4bcd0fca73eddc65f7315465c11bc0922b 100644 (file)
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -37,6 +37,7 @@ tinyMCE.init({
                        else {
                                $('#profile-jot-desc').html(' ');
                        }        
+
                        if(textlen <= 140) {
                                $('#character-counter').removeClass('red');
                                $('#character-counter').removeClass('orange');
@@ -78,6 +79,18 @@ 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() {