bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Replace jquery-textcomplete with yuku/old-textcomplete

Browse source 
- Add a jQuery wrapper to minimize code changes
- Improve local autocomplete jQuery plugin to allow chaining
This commit is contained in:
Hypolite Petovan 2020-07-22 10:48:02 -04:00
parent 0bfe5966ae
commit f4afd56fa5
3 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
view/js/autocomplete.js
View file

@ -197,6 +197,23 @@ function string2bb(element) {
* jQuery plugin 'editor_autocomplete'
*/
(function( $ ) {
let textcompleteObjects = [];
// jQuery wrapper for yuku/old-textcomplete
// uses a local object directory to avoid recreating Textcomplete objects
$.fn.textcomplete = function (strategies, options) {
if (!(this.data('textcompleteId') in textcompleteObjects)) {
let editor = new Textcomplete.editors.Textarea(this.get(0));
this.data('textcompleteId', textcompleteObjects.length);
textcompleteObjects.push(new Textcomplete(editor, options));
}
textcompleteObjects[this.data('textcompleteId')].register(strategies);
return this;
};
/**
* This function should be called immediately after $.textcomplete() to prevent the escape key press to propagate
* after the autocompletion dropdown has closed.
@ -278,13 +295,10 @@ function string2bb(element) {
this.attr('autocomplete','off');
this.textcomplete([contacts, forums, smilies, tags], {className:'acpopup', zIndex:10000});
this.fixTextcompleteEscape();
};
})( jQuery );
/**
* jQuery plugin 'search_autocomplete'
*/
(function( $ ) {
return this;
};
$.fn.search_autocomplete = function(backend_url) {
// Autocomplete contacts
contacts = {
@ -317,10 +331,10 @@ function string2bb(element) {
this.textcomplete([contacts, community, tags], {className:'acpopup', maxCount:100, zIndex: 10000, appendTo:'nav'});
this.fixTextcompleteEscape();
this.on('textComplete:select', function(e, value, strategy) { submit_form(this); });
};
})( jQuery );
(function( $ ) {
return this;
};
$.fn.name_autocomplete = function(backend_url, typ, autosubmit, onselect) {
if(typeof typ === 'undefined') typ = '';
if(typeof autosubmit === 'undefined') autosubmit = false;
@ -345,10 +359,10 @@ function string2bb(element) {
if(typeof onselect !== 'undefined') {
this.on('textComplete:select', function(e, value, strategy) { onselect(value); });
}
};
})( jQuery );
(function( $ ) {
return this;
};
$.fn.bbco_autocomplete = function(type) {
if (type === 'bbcode') {
var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'quote', 'code', 'spoiler', 'map', 'img', 'url', 'audio', 'video', 'embed', 'youtube', 'vimeo', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'nobb', 'noparse', 'pre', 'abstract'];
@ -399,6 +413,8 @@ function string2bb(element) {
}
}
});
return this;
};
})( jQuery );
// @license-end

2
view/templates/head.tpl
View file

@ -35,7 +35,7 @@
<script type="text/javascript" src="view/js/modernizr.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
<script type="text/javascript" src="view/asset/jquery/dist/jquery.min.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
<script type="text/javascript" src="view/js/jquery.textinputs.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
<script type="text/javascript" src="view/js/jquery-textcomplete/jquery.textcomplete.min.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
<script type="text/javascript" src="view/asset/textcomplete/dist/textcomplete.min.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
<script type="text/javascript" src="view/js/autocomplete.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
<script type="text/javascript" src="view/asset/jquery-colorbox/jquery.colorbox-min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
<script type="text/javascript" src="view/asset/jgrowl/jquery.jgrowl.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>

2
view/theme/frio/templates/head.tpl
View file

@ -56,7 +56,7 @@
<script type="text/javascript" src="view/js/modernizr.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
<script type="text/javascript" src="view/asset/jquery/dist/jquery.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
<script type="text/javascript" src="view/js/jquery.textinputs.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
<script type="text/javascript" src="view/js/jquery-textcomplete/jquery.textcomplete.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
<script type="text/javascript" src="view/asset/textcomplete/dist/textcomplete.min.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
<script type="text/javascript" src="view/js/autocomplete.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
<script type="text/javascript" src="view/asset/jquery-colorbox/jquery.colorbox-min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
<script type="text/javascript" src="view/asset/jgrowl/jquery.jgrowl.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>