Skip to content

update tributejs, implement @ as trigger and use correct handle icon #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timjong93 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update tributejs, implement @ as trigger and use correct handle icon #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions client/views/pages/elements/logs/logInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Template.logInput.onRendered(function logInputRendered (){
this.autorun(function(){
initTribute();
}.bind(this));

this.createLog= (ticketId)=>{
let logHandles = [];

Expand Down Expand Up @@ -38,13 +39,14 @@ Template.logInput.onRendered(function logInputRendered (){
});

const initTribute = function(){
let handles = Handles.find({},{sort: {callsign: 1}}).fetch().map(function(h){return {key:h.callsign,value:h.name, col:'handles'}});
let handles = Handles.find({},{sort: {callsign: 1}}).fetch().map(function(h){return {key:h.callsign, value:h.name, icon:h.icon, col:'handles',}});
let users = Meteor.users.find({},{sort:{username:1}}).fetch().map(function(u){return {key:u.username,value:u.username, col:'users'}});
if (this.tribute) {
this.tribute.detach(Template.instance().find('.log-message'));
}
this.tribute = new Tribute({
autocompleteMode: true,
// autocompleteMode: true,
trigger: '@',
values: handles.concat(users),
selectTemplate: function (item) {
if (typeof item === 'undefined') return null;
Expand All @@ -59,9 +61,10 @@ const initTribute = function(){
},
menuItemTemplate: function (item) {
if(item.original.col == 'users'){
return '<i class="fa fa-user"></i> '+item.string;
return `<i class="fa fa-user"></i> ${item.string}`;
}else{
return '<i class="fa fa-car"></i> '+ item.string;
console.log(item);
return `<i class="fa fa-${item.original.icon}"></i> ${item.string}`;
}
}
});
Expand Down
301 changes: 0 additions & 301 deletions imports/lib/tribute/TributeEvents.js
View file
Open in desktop

This file was deleted.

Loading