Merge pull request #125 from tomtom84/master

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

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
old mode 100644 (file)
new mode 100755 (executable)
index 352c486..d6b172b
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -3,15 +3,27 @@
 
 var editor=false;
 var textlen = 0;
+var plaintext = '$editselect';
 
 function initEditor(cb){
        if (editor==false){
-               $("#profile-jot-text-loading").show();  
-               $("#jot-title-desc").show();
+               $("#profile-jot-text-loading").show();
+               if(plaintext == 'none') {
+                       $("#profile-jot-text-loading").hide();
+                       $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+                       editor = true;
+                       $("a#jot-perms-icon").fancybox({
+                               'transitionIn' : 'elastic',
+                               'transitionOut' : 'elastic'
+                       });
+                       $(".jothidden").show();
+                       if (typeof cb!="undefined") cb();
+                       return;
+               }       
                tinyMCE.init({
                        theme : "advanced",
                        mode : "specific_textareas",
-                       editor_selector: /(profile-jot-text|prvmail-text)/,
+                       editor_selector: $editselect,
                        auto_focus: "profile-jot-text",
                        plugins : "bbcode,paste,autoresize",
                        theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
@@ -106,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';
@@ -117,14 +129,13 @@ function enableOnUser(){
                $("#profile-jot-text").focus(enableOnUser);
                $("#profile-jot-text").click(enableOnUser);
 
-       
                var uploader = new window.AjaxUpload(
                        'wall-image-upload',
                        { action: 'wall_upload/$nickname',
                                name: 'userfile',
                                onSubmit: function(file,ext) { $('#profile-rotator').show(); },
                                onComplete: function(file,response) {
-                                       tinyMCE.execCommand('mceInsertRawHTML',false,response);
+                                       addeditortext(response);
                                        $('#profile-rotator').hide();
                                }                                
                        }
@@ -135,7 +146,7 @@ function enableOnUser(){
                                name: 'userfile',
                                onSubmit: function(file,ext) { $('#profile-rotator').show(); },
                                onComplete: function(file,response) {
-                                       tinyMCE.execCommand('mceInsertRawHTML',false,response);
+                                       addeditortext(response);
                                        $('#profile-rotator').hide();
                                }                                
                        }
@@ -168,7 +179,7 @@ function enableOnUser(){
                        reply = bin2hex(reply);
                        $('#profile-rotator').show();
                        $.get('parse_url?binurl=' + reply, function(data) {
-                               tinyMCE.execCommand('mceInsertRawHTML',false,data);
+                               addeditortext(data);
                                $('#profile-rotator').hide();
                        });
                }
@@ -177,14 +188,14 @@ function enableOnUser(){
        function jotVideoURL() {
                reply = prompt("$vidurl");
                if(reply && reply.length) {
-                       tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+                       addeditortext('[video]' + reply + '[/video]');
                }
        }
 
        function jotAudioURL() {
                reply = prompt("$audurl");
                if(reply && reply.length) {
-                       tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+                       addeditortext('[audio]' + reply + '[/audio]');
                }
        }
 
@@ -196,20 +207,14 @@ function enableOnUser(){
                }
        }
 
-       function jotTitle() {
-               reply = prompt("$title", $('#jot-title').val());
-               if(reply && reply.length) {
-                       $('#jot-title').val(reply);
-               }
-       }
-
-
        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(){
-                               tinyMCE.execCommand('mceInsertRawHTML',false,data);
+                               addeditortext(data);
                                $('#like-rotator-' + id).hide();
                                $(window).scrollTop(0);
                        });
@@ -233,7 +238,7 @@ function enableOnUser(){
                        $.get('parse_url?binurl=' + reply, function(data) {
                                if (!editor) $("#profile-jot-text").val("");
                                initEditor(function(){
-                                       tinyMCE.execCommand('mceInsertRawHTML',false,data);
+                                       addeditortext(data);
                                        $('#profile-rotator').hide();
                                });
                        });
@@ -262,6 +267,15 @@ function enableOnUser(){
                $('#profile-nolocation-wrapper').hide();
        }
 
+       function addeditortext(data) {
+               if(plaintext == 'none') {
+                       var currentText = $("#profile-jot-text").val();
+                       $("#profile-jot-text").val(currentText + data);
+               }
+               else
+                       tinyMCE.execCommand('mceInsertRawHTML',false,data);
+       }       
+
        $geotag
 
 </script>