]> git.mxchange.org Git - friendica.git/commitdiff
rework autocomplete: seperate bbcode completion
authorrabuzarus <>
Thu, 14 Apr 2016 21:59:29 +0000 (23:59 +0200)
committerrabuzarus <>
Thu, 14 Apr 2016 21:59:29 +0000 (23:59 +0200)
js/autocomplete.js
js/main.js
view/templates/event_head.tpl
view/templates/jot-header.tpl
view/templates/msg-header.tpl
view/theme/smoothly/templates/jot-header.tpl
view/theme/vier/templates/event_form.tpl

index f31161ff834e2574f161a117cacfee583a8ffe0a..053cc9e3aa56b34b29f7b45e7febbaec1407ddf9 100644 (file)
@@ -111,15 +111,70 @@ function submit_form(e) {
        $(e).parents('form').submit();
 }
 
+function getWord(text, caretPos) {
+       var index = text.indexOf(caretPos);
+       var postText = text.substring(caretPos, caretPos+8);
+       if ((postText.indexOf("[/list]") > 0) || postText.indexOf("[/ul]") > 0 || postText.indexOf("[/ol]") > 0) {
+               return postText;
+       }
+}
+
+function getCaretPosition(ctrl) {
+       var CaretPos = 0;   // IE Support
+       if (document.selection) {
+               ctrl.focus();
+               var Sel = document.selection.createRange();
+               Sel.moveStart('character', -ctrl.value.length);
+               CaretPos = Sel.text.length;
+       }
+       // Firefox support
+       else if (ctrl.selectionStart || ctrl.selectionStart == '0')
+               CaretPos = ctrl.selectionStart;
+       return (CaretPos);
+}
+
+function setCaretPosition(ctrl, pos){
+       if(ctrl.setSelectionRange) {
+               ctrl.focus();
+               ctrl.setSelectionRange(pos,pos);
+       }
+       else if (ctrl.createTextRange) {
+               var range = ctrl.createTextRange();
+               range.collapse(true);
+               range.moveEnd('character', pos);
+               range.moveStart('character', pos);
+               range.select();
+       }
+}
+
+function listNewLineAutocomplete(id) {
+       var text = document.getElementById(id);
+       var caretPos = getCaretPosition(text)
+       var word = getWord(text.value, caretPos);
+       if (word != null) {
+               var textBefore = text.value.substring(0, caretPos);
+               var textAfter  = text.value.substring(caretPos, text.length);
+               $('#' + id).val(textBefore + '\r\n[*] ' + textAfter);
+               setCaretPosition(text, caretPos + 5);
+               return true;
+       }
+}
+
+function string2bb(element) {
+       if(element == 'bold') return 'b';
+       else if(element == 'italic') return 'i';
+       else if(element == 'underline') return 'u';
+       else if(element == 'overline') return 'o';
+       else if(element == 'strike') return 's';
+       else return element;
+}
+
 /**
  * jQuery plugin 'editor_autocomplete'
  */
 (function( $ ) {
        $.fn.editor_autocomplete = function(backend_url) {
 
-               // list of supported bbtags
-               var bbelements = ['b', 'u', 'i', 'img', 'url', 'quote', 'code', 'spoiler', 'audio', 'video', 'youtube', 'map', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 's', 'o', 'list', 'center', 'nosmile', 'vimeo' ];
-
                // Autocomplete contacts
                contacts = {
                        match: /(^|\s)(@\!*)([^ \n]+)$/,
@@ -138,15 +193,8 @@ function submit_form(e) {
                        replace: function(item) { return "$1" + item.text + ' '; },
                };
 
-               // Autocomplete BBTags
-               bbtags = {
-                       match: /\[(\w*)$/,
-                       index: 1,
-                       search: function (term, callback) { callback($.map(bbelements, function (element) { return element.indexOf(term) === 0 ? element : null; })); },
-                       replace: function (element) { return ['[' + element + ']', '[/' + element + ']']; },
-               };
                this.attr('autocomplete','off');
-               this.textcomplete([contacts,smilies, bbtags], {className:'acpopup', zIndex:1020});
+               this.textcomplete([contacts,smilies], {className:'acpopup', zIndex:1020});
        };
 })( jQuery );
 
@@ -229,6 +277,58 @@ function submit_form(e) {
        };
 })( jQuery );
 
+(function( $ ) {
+       $.fn.bbco_autocomplete = function(type) {
+
+               if(type=='bbcode') {
+                       var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'quote', 'code', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size'];
+                       var open_elements = ['*', 'hr'];
+
+                       var elements = open_close_elements.concat(open_elements);
+               }
+
+               bbco = {
+                       match: /\[(\w*\**)$/,
+                       search: function (term, callback) {
+                               callback($.map(elements, function (element) {
+                                       return element.indexOf(term) === 0 ? element : null;
+                               }));
+                       },
+                       index: 1,
+                       replace: function (element) {
+                               element = string2bb(element);
+                               if(open_elements.indexOf(element) < 0) {
+                                       if(element === 'list' || element === 'ol' || element === 'ul') {
+                                               return ['\[' + element + '\]' + '\n\[*\] ', '\n\[/' + element + '\]'];
+                                       }
+                                       else if(element === 'table') {
+                                               return ['\[' + element + '\]' + '\n\[tr\]', '\[/tr\]\n\[/' + element + '\]'];
+                                       }
+                                       else {
+                                               return ['\[' + element + '\]', '\[/' + element + '\]'];
+                                       }
+                               }
+                               else {
+                                       return '\[' + element + '\] ';
+                               }
+                       }
+               };
+
+               this.attr('autocomplete','off');
+               var a = this.textcomplete([bbco], {className:'acpopup', zIndex:1020});
+
+               a.on('textComplete:select', function(e, value, strategy) { value; });
+
+               a.keypress(function(e){
+                       e.stopImmediatePropagation();
+                       if (e.keyCode == 13) {
+                               var x = listNewLineAutocomplete(this.id);
+                               if(x)
+                                       e.preventDefault();
+                       }
+               });
+       };
+})( jQuery );
 
 /**
  * Friendica people autocomplete legacy
index 1ed0c4b6afa0647142dc905c2db965364f22ad5f..7e1c22ecfc61642ed1191452153421899a3647c3 100644 (file)
                        }
                        /* autocomplete @nicknames */
                        $(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl");
+                       /* autocomplete bbcode */
+ +                     $(".comment-edit-form  textarea").bbco_autocomplete('bbcode');
 
                        // setup videos, since VideoJS won't take care of any loaded via AJAX
                        if(typeof videojs != 'undefined') videojs.autoSetup();
index 745327e992b7a25e14e789613a85458fd521c4b5..de5ad6070cdb97ed99c8454ca8719e93500e1b0f 100644 (file)
 
 
        $(document).ready(function() { 
+               {{if $editselect = 'none'}}
+               $("#comment-edit-text-desc").bbco_autocomplete('bbcode');
+               {{/if}}
 
                $('#event-share-checkbox').change(function() {
 
index d12293f04c7743a1896b13687b60c45fc27b2cf2..7498bfc4221648892feff2b7126c721c2c2696bc 100644 (file)
@@ -24,6 +24,7 @@ function initEditor(cb){
                        $("#profile-jot-text-loading").hide();
                        $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
                        $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
+                       $("#profile-jot-text").bbco_autocomplete('bbcode');
                        editor = true;
                        $("a#jot-perms-icon").colorbox(colorbox_options);
                        $(".jothidden").show();
index 9b1a92ef5fc9938d47d26d354660c43017902c59..ca91923524d0e04e76fd5aab4b1072afc2380358 100644 (file)
@@ -63,6 +63,11 @@ else
                        }
                );
 
+               {{if $editselect = 'none'}}
+               $("#prvmail-text").bbco_autocomplete('bbcode');
+               {{/if}}
+
+
        });
 
        function jotGetLink() {
index 8b2666f0f3f147254694edbfa4be0f658b279081..880764da00f8da616d00dc5ba90d138f8e883f9e 100644 (file)
@@ -13,6 +13,7 @@ function initEditor(cb){
                        $("#profile-jot-text-loading").hide();
                        $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
                        $("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
+                       $("#profile-jot-text").bbco_autocomplete('bbcode');
                        $(".jothidden").show();
                        editor = true;
                        $("a#jot-perms-icon").colorbox({
index 165234c262f28f266f23bb82b9dda3cba2438c60..4f3240de8ef853c99c3cf0b1da4178a6c095c746 100644 (file)
@@ -34,7 +34,7 @@
 
 
 <div id="event-desc-text">{{$d_text}}</div>
-<textarea id="comment-edit-text-desc" rows="8" cols="64" name="desc">{{$d_orig}}</textarea>
+<textarea id="comment-edit-text-desc" rows="8" cols="64" name="desc" autocomplete="off">{{$d_orig}}</textarea>
 <div id="event-desc-text-edit-bb" class="comment-edit-bb">
        <a title="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="desc"><i class="icon-picture"></i></a>      
        <a title="{{$edurl}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="desc"><i class="icon-link"></i></a>