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 3b4c8c615a2dc7fb654c51245bf8b80887f239f0..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,15 +79,29 @@ 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() {
                                selstr = $(this).text();
                                $('#jot-perms-icon').removeClass('unlock').addClass('lock');
+                               $('#jot-public').hide();
                                $('.profile-jot-net input').attr('disabled', 'disabled');
                        });
                        if(selstr == null) { 
                                $('#jot-perms-icon').removeClass('lock').addClass('unlock');
+                               $('#jot-public').show();
                                $('.profile-jot-net input').attr('disabled', false);
                        }