Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: textcomplete over jquery-textcomplete, closes #7309

Browse Source
This commit is contained in:
Julian Lam
2019-01-28 13:05:25 -05:00
parent 362d9397dd
commit 02a8ed9b11
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/package.json
View File

@@ -80,7 +80,7 @@
"mousetrap": "^1.6.1", "mousetrap": "^1.6.1",
"mubsub-nbb": "^1.5.0", "mubsub-nbb": "^1.5.0",
"nconf": "^0.10.0", "nconf": "^0.10.0",
"nodebb-plugin-composer-default": "6.1.21", "nodebb-plugin-composer-default": "6.2.0",
"nodebb-plugin-dbsearch": "3.0.6", "nodebb-plugin-dbsearch": "3.0.6",
"nodebb-plugin-emoji": "^2.2.5", "nodebb-plugin-emoji": "^2.2.5",
"nodebb-plugin-emoji-android": "2.0.0", "nodebb-plugin-emoji-android": "2.0.0",

15
public/src/client/chats.js
View File

@@ -9,7 +9,8 @@ define('forum/chats', [
'forum/chats/search', 'forum/chats/search',
'forum/chats/messages', 'forum/chats/messages',
'benchpress', 'benchpress',
], function (components, translator, mousetrap, recentChats, search, messages, Benchpress) { 'composer/autocomplete',
], function (components, translator, mousetrap, recentChats, search, messages, Benchpress, autocomplete) {
var Chats = { var Chats = {
initialised: false, initialised: false,
}; };
@@ -361,18 +362,18 @@ define('forum/chats', [
element: element, element: element,
strategies: [], strategies: [],
options: { options: {
zIndex: 20000, style: {
listPosition: function (position) { 'z-index': 20000,
this.$el.css(this._applyPlacement(position)); flex: 0,
this.$el.css('position', 'absolute'); top: 'inherit',
return this;
}, },
placement: 'top',
}, },
}; };
$(window).trigger('chat:autocomplete:init', data); $(window).trigger('chat:autocomplete:init', data);
if (data.strategies.length) { if (data.strategies.length) {
data.element.textcomplete(data.strategies, data.options); autocomplete.setup(data);
} }
}; };

3
src/meta/js.js
View File

@@ -17,12 +17,13 @@ JS.scripts = {
'node_modules/promise-polyfill/dist/polyfill.js', 'node_modules/promise-polyfill/dist/polyfill.js',
'node_modules/jquery/dist/jquery.js', 'node_modules/jquery/dist/jquery.js',
'node_modules/socket.io-client/dist/socket.io.js', 'node_modules/socket.io-client/dist/socket.io.js',
'node_modules/textcomplete/dist/textcomplete.min.js',
'node_modules/textcomplete.contenteditable/dist/textcomplete.codemirror.min.js',
'public/vendor/jquery/timeago/jquery.timeago.js', 'public/vendor/jquery/timeago/jquery.timeago.js',
'public/vendor/jquery/js/jquery.form.min.js', 'public/vendor/jquery/js/jquery.form.min.js',
'public/vendor/visibility/visibility.min.js', 'public/vendor/visibility/visibility.min.js',
'node_modules/bootstrap/dist/js/bootstrap.js', 'node_modules/bootstrap/dist/js/bootstrap.js',
'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js', 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js',
'public/vendor/jquery/textcomplete/jquery.textcomplete.js',
'public/vendor/requirejs/require.js', 'public/vendor/requirejs/require.js',
'public/src/require-config.js', 'public/src/require-config.js',
'public/vendor/bootbox/bootbox.js', 'public/vendor/bootbox/bootbox.js',