-
-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Move tributejs to npm/webpack #11497
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.
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
918f39c
Move tributejs to npm/webpack
silverwind f7b3d57
fix mention
silverwind 762b552
also include emoji on #content
silverwind 9c5528d
Update web_src/less/_tribute.less
silverwind d1a1121
rewrite to only use one instance of Tribute
silverwind 1878c53
refactor
silverwind 2439fac
fix copy/paste error
silverwind 138761d
Merge branch 'master' into tribute-webpack
techknowlogick f7febc2
Merge branch 'master' into tribute-webpack
techknowlogick File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,72 @@ | ||
| import {emojiKeys, emojiHTML, emojiString} from './emoji.js'; | ||
|
|
||
| export const issuesTribute = window.config.Tribute ? new Tribute({ | ||
| values: window.config.tributeValues, | ||
| noMatchTemplate() { return null }, | ||
| menuItemTemplate(item) { | ||
| const div = $('<div/>'); | ||
| div.append($('<img/>', {src: item.original.avatar})); | ||
| div.append($('<span/>', {class: 'name'}).text(item.original.name)); | ||
| if (item.original.fullname && item.original.fullname !== '') { | ||
| div.append($('<span/>', {class: 'fullname'}).text(item.original.fullname)); | ||
| function createMentionsTribute(Tribute) { | ||
| return new Tribute({ | ||
| values: window.config.tributeValues, | ||
| noMatchTemplate() { return null }, | ||
| menuItemTemplate(item) { | ||
| return ` | ||
| <div class="tribute-item"> | ||
| <img src="${item.original.avatar}"/> | ||
| <span class="name">${item.original.name}</span> | ||
| ${item.original.fullname && item.original.fullname !== '' ? `<span class="fullname">${item.original.fullname}</span>` : ''} | ||
| </div> | ||
| `; | ||
| } | ||
| return div.html(); | ||
| } | ||
| }) : null; | ||
|
|
||
| export const emojiTribute = window.config.Tribute ? new Tribute({ | ||
| collection: [{ | ||
| trigger: ':', | ||
| requireLeadingSpace: true, | ||
| values(query, cb) { | ||
| const matches = []; | ||
| for (const name of emojiKeys) { | ||
| if (name.includes(query)) { | ||
| matches.push(name); | ||
| if (matches.length > 5) break; | ||
| }); | ||
| } | ||
|
|
||
| function createEmojiTribute(Tribute) { | ||
| return new Tribute({ | ||
| collection: [{ | ||
| trigger: ':', | ||
| requireLeadingSpace: true, | ||
| values(query, cb) { | ||
| const matches = []; | ||
| for (const name of emojiKeys) { | ||
| if (name.includes(query)) { | ||
| matches.push(name); | ||
| if (matches.length > 5) break; | ||
| } | ||
| } | ||
| cb(matches); | ||
| }, | ||
| lookup(item) { | ||
| return item; | ||
| }, | ||
| selectTemplate(item) { | ||
| if (typeof item === 'undefined') return null; | ||
| return emojiString(item.original); | ||
| }, | ||
| menuItemTemplate(item) { | ||
| return `<div class="tribute-item">${emojiHTML(item.original)}<span>${item.original}</span></div>`; | ||
| } | ||
| cb(matches); | ||
| }, | ||
| lookup(item) { | ||
| return item; | ||
| }, | ||
| selectTemplate(item) { | ||
| if (typeof item === 'undefined') return null; | ||
| return emojiString(item.original); | ||
| }, | ||
| menuItemTemplate(item) { | ||
| return `<div class="tribute-item">${emojiHTML(item.original)}<span>${item.original}</span></div>`; | ||
| } | ||
| }] | ||
| }) : null; | ||
| }] | ||
| }); | ||
| } | ||
|
|
||
| export function initTribute() { | ||
| if (!window.config.Tribute) return; | ||
| export async function attachTribute(elementOrNodeList, {mentions, emoji} = {}) { | ||
| if (!window.config.Tribute || !elementOrNodeList) return; | ||
| const nodes = Array.from('length' in elementOrNodeList ? elementOrNodeList : [elementOrNodeList]); | ||
| if (!nodes.length) return; | ||
|
|
||
| let content = document.getElementById('content'); | ||
| if (content !== null) { | ||
| issuesTribute.attach(content); | ||
| } | ||
| const {default: Tribute} = await import(/* webpackChunkName: "tribute" */'tributejs'); | ||
|
|
||
| const mentionNodes = nodes.filter((node) => { | ||
| return mentions || node.id === 'content'; | ||
| }); | ||
| const emojiNodes = nodes.filter((node) => { | ||
| return emoji || node.id === 'content' || node.classList.contains('emoji-input'); | ||
| }); | ||
|
|
||
| const mentionTribute = mentionNodes.length && createMentionsTribute(Tribute); | ||
| const emojiTribute = emojiNodes.length && createEmojiTribute(Tribute); | ||
|
|
||
| const emojiInputs = document.querySelectorAll('.emoji-input'); | ||
| if (emojiInputs.length > 0) { | ||
| emojiTribute.attach(emojiInputs); | ||
| for (const node of mentionNodes || []) { | ||
| mentionTribute.attach(node); | ||
| } | ||
|
|
||
| content = document.getElementById('content'); | ||
| if (content !== null) { | ||
| emojiTribute.attach(document.getElementById('content')); | ||
| for (const node of emojiNodes || []) { | ||
| emojiTribute.attach(node); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,42 @@ | ||
| @import "~tributejs/dist/tribute.css"; | ||
|
|
||
| .tribute-container { | ||
| box-shadow: 0 1px 3px 1px #c7c7c7; | ||
|
|
||
| ul { | ||
| background: #ffffff; | ||
| } | ||
|
|
||
| li { | ||
| padding: 8px 12px; | ||
| border-bottom: 1px solid #dcdcdc; | ||
|
|
||
| img { | ||
| display: inline-block; | ||
| vertical-align: middle; | ||
| width: 28px; | ||
| height: 28px; | ||
| margin-right: 5px; | ||
| } | ||
|
|
||
| span.fullname { | ||
| font-weight: normal; | ||
| font-size: .8rem; | ||
| margin-left: 3px; | ||
| } | ||
| } | ||
|
|
||
| li.highlight, | ||
| li:hover { | ||
| background: #2185d0; | ||
| color: #ffffff; | ||
| } | ||
| box-shadow: 0 .25rem .5rem rgba(0, 0, 0, .25); | ||
| border-radius: .25rem; | ||
| } | ||
|
|
||
| .tribute-container ul { | ||
| margin-top: 0 !important; | ||
| background: #ffffff !important; | ||
| } | ||
|
|
||
| .tribute-container li { | ||
| padding: 3px .5rem !important; | ||
| } | ||
|
|
||
| .tribute-container img span.fullname { | ||
| font-weight: normal; | ||
| font-size: .8rem; | ||
| margin-left: 3px; | ||
| } | ||
|
|
||
| .tribute-container li.highlight, | ||
| .tribute-container li:hover { | ||
| background: #2185d0 !important; | ||
| color: #ffffff !important; | ||
| } | ||
|
|
||
| .tribute-item { | ||
| display: flex; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .tribute-item .emoji { | ||
| .tribute-item .emoji, | ||
| .tribute-item img[src*="/avatar/"] { | ||
| margin-right: .5rem; | ||
| } | ||
|
|
||
| .tribute-container img { | ||
| width: 1.5rem !important; | ||
| height: 1.5rem !important; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.