Skip to content

Fix release bugs fix #74

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

Merged
alexander-b-clean merged 3 commits into from
Feb 6, 2026
Merged

Fix release bugs fix #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a82fe09
Fix release bugs fix
datorik Feb 5, 2026
e515b13
Merge branch 'dev' into fix-release-bugs.ab
datorik Feb 5, 2026
f805296
Resolve conflicts
datorik Feb 5, 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
70 changes: 45 additions & 25 deletions dist/doboard-widget-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8605,6 +8605,7 @@ async function handleCreateTask(sessionId, taskDetails) {
const result = await createTaskDoboard(sessionId, taskDetails);
if (result && result.taskId && taskDetails.taskDescription) {
const sign = `<br><br><br><em>The spot has been posted at the following URL <a href="${window.location.href}"><span class="task-link task-link--done">${window.location.href}</span></a></em>`;
localStorage.setItem('spotfix-description', '');
await addTaskComment({
projectToken: taskDetails.projectToken,
accountId: taskDetails.accountId,
Expand Down Expand Up @@ -8911,8 +8912,8 @@ function changeSize(container) {
}
function addIconPack() {

if (tinymce?.IconManager) {
tinymce.IconManager.add("my_icon_pack", {
if (SpotFixTinyMCE?.IconManager) {
SpotFixTinyMCE.IconManager.add("icon_pack_SpotFix", {
icons: {
'paperclip': '<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">\n' +
'<path d="M14.4648 0.522461C15.6367 0.522493 16.7612 0.987773 17.5898 1.81641C18.4185 2.64507 18.8838 3.76952 18.8838 4.94141C18.8837 6.11309 18.4183 7.23685 17.5898 8.06543L9.15625 16.4902C8.6717 16.9747 8.01428 17.247 7.3291 17.2471C6.64372 17.2471 5.98563 16.9749 5.50098 16.4902C5.01634 16.0056 4.74414 15.3475 4.74414 14.6621C4.74422 13.9769 5.01652 13.3195 5.50098 12.835L13.2842 5.06152C13.5771 4.76897 14.052 4.7688 14.3447 5.06152C14.6374 5.35457 14.6377 5.83034 14.3447 6.12305L6.5625 13.8955C6.35922 14.0988 6.24422 14.3746 6.24414 14.6621C6.24414 14.9497 6.35916 15.2254 6.5625 15.4287C6.76585 15.632 7.04154 15.7471 7.3291 15.7471C7.61656 15.747 7.89243 15.632 8.0957 15.4287L16.5293 7.00488L16.7227 6.79102C17.1482 6.27169 17.3837 5.61868 17.3838 4.94141C17.3838 4.16735 17.0766 3.42431 16.5293 2.87695C15.982 2.32963 15.2389 2.02249 14.4648 2.02246C13.691 2.02253 12.9486 2.32984 12.4014 2.87695L3.97754 11.3018C3.08624 12.1931 2.58504 13.4016 2.58496 14.6621C2.58496 15.9227 3.08617 17.1321 3.97754 18.0234C4.86885 18.9146 6.0775 19.415 7.33789 19.415C8.59844 19.415 9.80788 18.9148 10.6992 18.0234L19.123 9.59961C19.4159 9.30678 19.8907 9.30674 20.1836 9.59961C20.4763 9.8925 20.4764 10.3673 20.1836 10.6602L11.7598 19.084C10.5871 20.2566 8.99626 20.915 7.33789 20.915C5.67955 20.915 4.08866 20.2566 2.91602 19.084C1.74348 17.9113 1.08496 16.3204 1.08496 14.6621C1.08504 13.004 1.74366 11.4138 2.91602 10.2412L11.3408 1.81641C12.1694 0.987987 13.2932 0.52253 14.4648 0.522461Z" fill="#707A83"/>\n' +
Expand Down Expand Up @@ -9644,19 +9645,33 @@ class CleanTalkWidgetDoboard {
this.bindCreateTaskEvents();
this.bindShowLoginFormEvents();

tinymce.init({
if (tinymce.get('doboard_task_widget-description')) {
tinymce.remove('#doboard_task_widget-description');
}

const savedDescription = localStorage.getItem('spotfix-description') || '';

SpotFixTinyMCE.init({
selector: '#doboard_task_widget-description',
plugins: 'link lists',
menubar: false,
statusbar: false,
toolbar_location: 'bottom',
toolbar: 'screenshotButton emoticons bullist numlist bold italic strikethrough underline blockquote',
height: 120,
icons: 'my_icon_pack',
icons: 'icon_pack_SpotFix',
file_picker_types: 'file image media',
setup: function (editor) {
editor.on('init', function() {
if (savedDescription) {
editor.setContent(savedDescription);
editor.save();
}
});
editor.on('change', function () {
editor.save();
const content = editor.getContent();
localStorage.setItem('spotfix-description', content);
});
// editor.ui.registry.addButton('attachmentButton', {
// icon: 'paperclip',
Expand Down Expand Up @@ -9981,15 +9996,19 @@ class CleanTalkWidgetDoboard {

const fileUploader = this.fileUploader;

tinymce.init({
selector: '.doboard_task_widget-send_message_input',
if (tinymce.get('doboard_task_widget-send_message_input_SpotFix')) {
tinymce.remove('#doboard_task_widget-send_message_input_SpotFix');
}

SpotFixTinyMCE.init({
selector: '#doboard_task_widget-send_message_input_SpotFix',
plugins: 'link lists',
menubar: false,
statusbar: false,
toolbar_location: 'bottom',
toolbar: 'attachmentButton screenshotButton emoticons bullist numlist bold italic strikethrough underline blockquote',
height: 120,
icons: 'my_icon_pack',
icons: 'icon_pack_SpotFix',
file_picker_types: 'file image media',
setup: function (editor) {
editor.on('change', function () {
Expand Down Expand Up @@ -10175,13 +10194,6 @@ class CleanTalkWidgetDoboard {
}
});

document.getElementById('doboard_task_widget-description')?.addEventListener('change', (e) => {
localStorage.setItem('spotfix-description-ls', e.target.value);
if (e.target.value.length < 1) {
document.querySelector('.spotfix_placeholder_description').style.display = 'block';
}
})

return widgetContainer;
}

Expand Down Expand Up @@ -10619,7 +10631,7 @@ function spotFixInit() {

function loadBotDetector() {

const detector = document.querySelectorAll('script[src^="https://fd.cleantalk.org/ct-bot-detector-wrapper.js"]');
const detector = document.querySelectorAll('script[src*="fd.cleantalk.org/ct-bot-detector-wrapper.js"]');
if (detector.length > 0 || document.getElementById('ct-bot-detector-script')) {
return;
}
Expand All @@ -10635,15 +10647,23 @@ function loadBotDetector() {
* Downloads TinyMCE script from doboard.com
*/
function loadTinyMCE() {
const script = document.createElement('script');
script.src = 'https://doboard.com/tinymce/tinymce.min.js';
script.async = true;

script.onload = function() {
addIconPack();
};

document.head.appendChild(script);
return new Promise((resolve) => {
const existingTinyMCE_temp = window.tinymce;
window.tinymce = null;
const script = document.createElement('script');
script.src = 'https://doboard.com/tinymce/tinymce.min.js';
script.async = true;

script.onload = function () {
window.SpotFixTinyMCE = window.tinymce;
if (existingTinyMCE_temp) {
window.tinymce = existingTinyMCE_temp;
}
addIconPack();
};
resolve(window.SpotFixTinyMCE);
document.head.appendChild(script);
});
}

document.addEventListener('selectionchange', function(e) {
Expand Down Expand Up @@ -12286,7 +12306,7 @@ class SpotFixTemplatesLoader {
<div class="doboard_task_widget-concrete_issues-container">
</div>
<div class="doboard_task_widget-send_message">
<textarea name="doboard_task_widget_message" class="doboard_task_widget-send_message_input" placeholder="Write a message..."></textarea>
<textarea name="doboard_task_widget_message" id="doboard_task_widget-send_message_input_SpotFix" class="doboard_task_widget-send_message_input" placeholder="Write a message..."></textarea>
<div>
<div class="doboard_task_widget-field">
<button id="doboard_task_widget-submit_button" class="doboard_task_widget-submit_button doboard_task_widget-send_message_button">Submit</button>
Expand Down
4 changes: 2 additions & 2 deletions dist/doboard-widget-bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/doboard-widget-bundle.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions js/src/handlers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ async function handleCreateTask(sessionId, taskDetails) {
const result = await createTaskDoboard(sessionId, taskDetails);
if (result && result.taskId && taskDetails.taskDescription) {
const sign = `<br><br><br><em>The spot has been posted at the following URL <a href="${window.location.href}"><span class="task-link task-link--done">${window.location.href}</span></a></em>`;
localStorage.setItem('spotfix-description', '');
await addTaskComment({
projectToken: taskDetails.projectToken,
accountId: taskDetails.accountId,
Expand Down Expand Up @@ -383,8 +384,8 @@ function changeSize(container) {
}
function addIconPack() {

if (tinymce?.IconManager) {
tinymce.IconManager.add("my_icon_pack", {
if (SpotFixTinyMCE?.IconManager) {
SpotFixTinyMCE.IconManager.add("icon_pack_SpotFix", {
icons: {
'paperclip': '<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">\n' +
'<path d="M14.4648 0.522461C15.6367 0.522493 16.7612 0.987773 17.5898 1.81641C18.4185 2.64507 18.8838 3.76952 18.8838 4.94141C18.8837 6.11309 18.4183 7.23685 17.5898 8.06543L9.15625 16.4902C8.6717 16.9747 8.01428 17.247 7.3291 17.2471C6.64372 17.2471 5.98563 16.9749 5.50098 16.4902C5.01634 16.0056 4.74414 15.3475 4.74414 14.6621C4.74422 13.9769 5.01652 13.3195 5.50098 12.835L13.2842 5.06152C13.5771 4.76897 14.052 4.7688 14.3447 5.06152C14.6374 5.35457 14.6377 5.83034 14.3447 6.12305L6.5625 13.8955C6.35922 14.0988 6.24422 14.3746 6.24414 14.6621C6.24414 14.9497 6.35916 15.2254 6.5625 15.4287C6.76585 15.632 7.04154 15.7471 7.3291 15.7471C7.61656 15.747 7.89243 15.632 8.0957 15.4287L16.5293 7.00488L16.7227 6.79102C17.1482 6.27169 17.3837 5.61868 17.3838 4.94141C17.3838 4.16735 17.0766 3.42431 16.5293 2.87695C15.982 2.32963 15.2389 2.02249 14.4648 2.02246C13.691 2.02253 12.9486 2.32984 12.4014 2.87695L3.97754 11.3018C3.08624 12.1931 2.58504 13.4016 2.58496 14.6621C2.58496 15.9227 3.08617 17.1321 3.97754 18.0234C4.86885 18.9146 6.0775 19.415 7.33789 19.415C8.59844 19.415 9.80788 18.9148 10.6992 18.0234L19.123 9.59961C19.4159 9.30678 19.8907 9.30674 20.1836 9.59961C20.4763 9.8925 20.4764 10.3673 20.1836 10.6602L11.7598 19.084C10.5871 20.2566 8.99626 20.915 7.33789 20.915C5.67955 20.915 4.08866 20.2566 2.91602 19.084C1.74348 17.9113 1.08496 16.3204 1.08496 14.6621C1.08504 13.004 1.74366 11.4138 2.91602 10.2412L11.3408 1.81641C12.1694 0.987987 13.2932 0.52253 14.4648 0.522461Z" fill="#707A83"/>\n' +
Expand Down
2 changes: 1 addition & 1 deletion js/src/loaders/SpotFixTemplatesLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class SpotFixTemplatesLoader {
<div class="doboard_task_widget-concrete_issues-container">
</div>
<div class="doboard_task_widget-send_message">
<textarea name="doboard_task_widget_message" class="doboard_task_widget-send_message_input" placeholder="Write a message..."></textarea>
<textarea name="doboard_task_widget_message" id="doboard_task_widget-send_message_input_SpotFix" class="doboard_task_widget-send_message_input" placeholder="Write a message..."></textarea>
<div>
<div class="doboard_task_widget-field">
<button id="doboard_task_widget-submit_button" class="doboard_task_widget-submit_button doboard_task_widget-send_message_button">Submit</button>
Expand Down
28 changes: 18 additions & 10 deletions js/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function spotFixInit() {

function loadBotDetector() {

const detector = document.querySelectorAll('script[src^="https://fd.cleantalk.org/ct-bot-detector-wrapper.js"]');
const detector = document.querySelectorAll('script[src*="fd.cleantalk.org/ct-bot-detector-wrapper.js"]');
if (detector.length > 0 || document.getElementById('ct-bot-detector-script')) {
return;
}
Expand All @@ -37,15 +37,23 @@ function loadBotDetector() {
* Downloads TinyMCE script from doboard.com
*/
function loadTinyMCE() {
const script = document.createElement('script');
script.src = 'https://doboard.com/tinymce/tinymce.min.js';
script.async = true;

script.onload = function() {
addIconPack();
};

document.head.appendChild(script);
return new Promise((resolve) => {
const existingTinyMCE_temp = window.tinymce;
window.tinymce = null;
const script = document.createElement('script');
script.src = 'https://doboard.com/tinymce/tinymce.min.js';
script.async = true;

script.onload = function () {
window.SpotFixTinyMCE = window.tinymce;
if (existingTinyMCE_temp) {
window.tinymce = existingTinyMCE_temp;
}
addIconPack();
};
resolve(window.SpotFixTinyMCE);
document.head.appendChild(script);
});
}

document.addEventListener('selectionchange', function(e) {
Expand Down
35 changes: 23 additions & 12 deletions js/src/widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,19 +674,33 @@ class CleanTalkWidgetDoboard {
this.bindCreateTaskEvents();
this.bindShowLoginFormEvents();

tinymce.init({
if (tinymce.get('doboard_task_widget-description')) {
tinymce.remove('#doboard_task_widget-description');
}

const savedDescription = localStorage.getItem('spotfix-description') || '';

SpotFixTinyMCE.init({
selector: '#doboard_task_widget-description',
plugins: 'link lists',
menubar: false,
statusbar: false,
toolbar_location: 'bottom',
toolbar: 'screenshotButton emoticons bullist numlist bold italic strikethrough underline blockquote',
height: 120,
icons: 'my_icon_pack',
icons: 'icon_pack_SpotFix',
file_picker_types: 'file image media',
setup: function (editor) {
editor.on('init', function() {
if (savedDescription) {
editor.setContent(savedDescription);
editor.save();
}
});
editor.on('change', function () {
editor.save();
const content = editor.getContent();
localStorage.setItem('spotfix-description', content);
});
// editor.ui.registry.addButton('attachmentButton', {
// icon: 'paperclip',
Expand Down Expand Up @@ -1011,15 +1025,19 @@ class CleanTalkWidgetDoboard {

const fileUploader = this.fileUploader;

tinymce.init({
selector: '.doboard_task_widget-send_message_input',
if (tinymce.get('doboard_task_widget-send_message_input_SpotFix')) {
tinymce.remove('#doboard_task_widget-send_message_input_SpotFix');
}

SpotFixTinyMCE.init({
selector: '#doboard_task_widget-send_message_input_SpotFix',
plugins: 'link lists',
menubar: false,
statusbar: false,
toolbar_location: 'bottom',
toolbar: 'attachmentButton screenshotButton emoticons bullist numlist bold italic strikethrough underline blockquote',
height: 120,
icons: 'my_icon_pack',
icons: 'icon_pack_SpotFix',
file_picker_types: 'file image media',
setup: function (editor) {
editor.on('change', function () {
Expand Down Expand Up @@ -1205,13 +1223,6 @@ class CleanTalkWidgetDoboard {
}
});

document.getElementById('doboard_task_widget-description')?.addEventListener('change', (e) => {
localStorage.setItem('spotfix-description-ls', e.target.value);
if (e.target.value.length < 1) {
document.querySelector('.spotfix_placeholder_description').style.display = 'block';
}
})

return widgetContainer;
}

Expand Down