Skip to content

fix: use alerts API and bind upload/picture handlers to active composer (NodeBB 4.4.x) #525

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
MusikschuleFroehlich wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: use alerts API and bind upload/picture handlers to active composer (NodeBB 4.4.x) #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e020e5
fix(quill): rebase on 4.1.0, bind upload toolbar to composer, skip du…
Jul 30, 2026
ba82abe
fix(quill): extend ignore list in toolbar configuration to include 'p…
Jul 30, 2026
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
1 change: 1 addition & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
24 changes: 5 additions & 19 deletions static/lib/quill-nbb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,7 @@ define('quill-nbb', [
});

$(window).on('action:composer.uploadUpdate', (evt, data) => {
// when update progress the filename use timestamp, so we need to remove timestamp
const filename = data.filename.replace(/^\d+_\d+_/, '');
const alertId = generateAlertId(data.post_uuid, filename);
if (!window.quill.uploads[filename]) {
console.warn(`[quill/uploads] Unable to find file (${filename}).`);
alerts.remove(alertId);
return;
}

if (!data.text.startsWith('/')) {
alerts.alert({
alert_id: alertId,
title: data.filename.replace(/\d_\d+_/, ''),
message: data.text,
timeout: 1000,
});
}
// Upload progress is handled globally by uploadHelpers
});

$(window).on('action:composer.upload', (evt, data) => {
Expand Down Expand Up @@ -407,7 +391,7 @@ window.quill.configureToolbar = async (targetEl, data) => {
const toolbarHandlers = formatting.getDispatchTable();
const group = [];
data.formatting.forEach((option) => {
const ignoreNames = ['tags', 'thumbs'];
const ignoreNames = ['tags', 'thumbs', 'picture', 'upload'];
if (ignoreNames.includes(option.name)) {
return;
}
Expand All @@ -427,7 +411,9 @@ window.quill.configureToolbar = async (targetEl, data) => {
if (app.user.privileges[privilege]) {
const name = privilege === 'upload:post:image' ? 'picture' : 'upload';
group.unshift(name);
toolbar.handlers[name] = toolbarHandlers[name].bind($('.formatting-bar'));
toolbar.handlers[name] = function () {
return toolbarHandlers[name].apply(data.postContainer, arguments);
};
}
});
toolbar.container.push(group);
Expand Down