Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixxm-issue-11

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

diff --git a/view/fr/jot-header.tpl b/view/fr/jot-header.tpl
index b687f65a69d70ee8512df188185f33c3021e22fc..ff7e543a5ed9928d38bfb45f931e92085aeac3ad 100644 (file)
--- a/view/fr/jot-header.tpl
+++ b/view/fr/jot-header.tpl
@@ -2,17 +2,20 @@
 <script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
+var editor;
+
 tinyMCE.init({
        theme : "advanced",
        mode : "specific_textareas",
        editor_selector: /(profile-jot-text|prvmail-text)/,
-       plugins : "bbcode",
-       theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect",
+       plugins : "bbcode,paste",
+       theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
        theme_advanced_buttons2 : "",
        theme_advanced_buttons3 : "",
        theme_advanced_toolbar_location : "top",
        theme_advanced_toolbar_align : "center",
        theme_advanced_blockformats : "blockquote,code",
+       paste_text_sticky : true,
        entity_encoding : "raw",
        add_unload_trigger : false,
        remove_linebreaks : false,
@@ -43,8 +46,13 @@ tinyMCE.init({
                                $('#character-counter').addClass('red');
                        }
                        $('#character-counter').text(text);
-               });
-       }
+       });
+
+               ed.onInit.add(function(ed) {
+                       ed.pasteAsPlainText = true;
+               });
+
+       }
 });
 
 </script>
@@ -67,11 +75,12 @@ tinyMCE.init({
                        $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
                                selstr = $(this).text();
                                $('#profile-jot-perms img').attr('src', 'images/lock_icon.gif');
-
+                               $('.profile-jot-net input').attr('disabled', 'disabled');
                        });
-                       if(selstr == null)
+                       if(selstr == null) {
                                $('#profile-jot-perms img').attr('src', 'images/unlock_icon.gif');
-
+                               $('.profile-jot-net input').attr('disabled', false);
+                       }
                }).trigger('change');
 
        });