Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy

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

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 00a4371c472d5aeb91b0ffea0bf3190e17f49e10..eb88f00c1f0a132afdf4a573d35515ac121a4d1e 100644 (file)
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -1,15 +1,16 @@
 
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
 var editor;
+var textlen = 0;
 
 tinyMCE.init({
        theme : "advanced",
        mode : "specific_textareas",
        editor_selector: /(profile-jot-text|prvmail-text)/,
-       plugins : "bbcode,paste",
-       theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+       plugins : "bbcode,paste,fullscreen,autoresize",
+       theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
        theme_advanced_buttons2 : "",
        theme_advanced_buttons3 : "",
        theme_advanced_toolbar_location : "top",
@@ -31,7 +32,7 @@ tinyMCE.init({
             //Character count
                ed.onKeyUp.add(function(ed, e) {
                        var txt = tinyMCE.activeEditor.getContent();
-                       var textlen = txt.length;
+                       textlen = txt.length;
                        if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
                                $('#profile-jot-desc').html(ispublic);
                        }
@@ -80,6 +81,17 @@ 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() {
@@ -98,6 +110,24 @@ tinyMCE.init({
 
        });
 
+       function deleteCheckedItems() {
+               var checkedstr = '';
+
+               $('.item-select').each( function() {
+                       if($(this).is(':checked')) {
+                               if(checkedstr.length != 0) {
+                                       checkedstr = checkedstr + ',' + $(this).val();
+                               }
+                               else {
+                                       checkedstr = $(this).val();
+                               }
+                       }       
+               });
+               $.post('item', { dropitems: checkedstr }, function(data) {
+                       window.location.reload();
+               });
+       }
+
        function jotGetLink() {
                reply = prompt("$linkurl");
                if(reply && reply.length) {