Merge pull request #67 from tomtom84/master

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

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 482fb0e0dc69f56a59039e7a37459a8db20f258f..d6b172b6af8c28e75af10cbf84ee2f2483cf3ac0 100755 (executable)
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -11,12 +11,12 @@ function initEditor(cb){
                if(plaintext == 'none') {
                        $("#profile-jot-text-loading").hide();
                        $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-                       $(".jothidden").show();
                        editor = true;
                        $("a#jot-perms-icon").fancybox({
                                'transitionIn' : 'elastic',
                                'transitionOut' : 'elastic'
-                       }); 
+                       });
+                       $(".jothidden").show();
                        if (typeof cb!="undefined") cb();
                        return;
                }       
@@ -118,7 +118,7 @@ function enableOnUser(){
 }
 
 </script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
 <script>
        var ispublic = '$ispublic';
        var addtitle = '$addtitle';
@@ -129,7 +129,6 @@ function enableOnUser(){
                $("#profile-jot-text").focus(enableOnUser);
                $("#profile-jot-text").click(enableOnUser);
 
-       
                var uploader = new window.AjaxUpload(
                        'wall-image-upload',
                        { action: 'wall_upload/$nickname',
@@ -209,15 +208,14 @@ function enableOnUser(){
        }
 
        function jotShare(id) {
+               if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
                $('#like-rotator-' + id).show();
                $.get('share/' + id, function(data) {
                        if (!editor) $("#profile-jot-text").val("");
                        initEditor(function(){
                                addeditortext(data);
                                $('#like-rotator-' + id).hide();
-                               if ($('#jot-popup').length != 0){
-                                       $('#jot-popup').show();
-                               } 
                                $(window).scrollTop(0);
                        });