Skip to content

SUP-19614: Hide list template dropdown, if no templates configured + … #1739

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
plyhun wants to merge 2 commits into
base: hotfix-2.1.x
Choose a base branch
from
+28 −17
Open

SUP-19614: Hide list template dropdown, if no templates configured + … #1739

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
47a7847
SUP-19614: Hide list template dropdown, if no templates configured + …
plyhun Jun 18, 2026
29ee7a2
Remove foreign dnd fix
plyhun Jun 18, 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
2 changes: 2 additions & 0 deletions build/changelog/entries/2026/06/8796.SUP-19614.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Format: Now the dropdown button is not shown next to the list buttons, if there are no corresponding list item templates configured.
Selection: A number of crash cases, caused by an incomplete selection context, has been eliminated.
36 changes: 19 additions & 17 deletions src/lib/aloha/selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ define([

function isCollapsedAndEmptyOrEndBr(rangeObject) {
var firstChild;
if (rangeObject.startContainer !== rangeObject.endContainer) {
if (!rangeObject || !rangeObject.startContainer || rangeObject.startContainer !== rangeObject.endContainer) {
return false;
}
// check whether the container starts in an element node
Expand Down Expand Up @@ -1385,14 +1385,14 @@ define([

if (markupObject.isReplacingElement) {
//Check if the startContainer is one of the zapped elements
if (backupRangeObject && backupRangeObject.startContainer.className && backupRangeObject.startContainer.className.indexOf('preparedForRemoval') > -1) {
if (backupRangeObject && backupRangeObject.startContainer && backupRangeObject.startContainer.className && backupRangeObject.startContainer.className.indexOf('preparedForRemoval') > -1) {
//var parentElement = jQuery(backupRangeObject.startContainer).closest(markupObject[0].tagName).get(0);
parentElement = jQuery(backupRangeObject.startContainer).parents(markupObject[0].tagName).get(0);
backupRangeObject.startContainer = parentElement;
rangeObject.startContainer = parentElement;
}
//check if the endContainer is one of the zapped elements
if (backupRangeObject && backupRangeObject.endContainer.className && backupRangeObject.endContainer.className.indexOf('preparedForRemoval') > -1) {
if (backupRangeObject && backupRangeObject.startContainer && backupRangeObject.endContainer.className && backupRangeObject.endContainer.className.indexOf('preparedForRemoval') > -1) {
//var parentElement = jQuery(backupRangeObject.endContainer).closest(markupObject[0].tagName).get(0);
parentElement = jQuery(backupRangeObject.endContainer).parents(markupObject[0].tagName).get(0);
backupRangeObject.endContainer = parentElement;
Expand All @@ -1406,20 +1406,22 @@ define([

// update selection
if (markupObject.isReplacingElement) {
//After the zapping we have to check for wrong offsets
if (Node.ELEMENT_NODE === backupRangeObject.startContainer.nodeType
&& backupRangeObject.startContainer.childNodes
&& backupRangeObject.startContainer.childNodes.length < backupRangeObject.startOffset
) {
backupRangeObject.startOffset = backupRangeObject.startContainer.childNodes.length;
rangeObject.startOffset = backupRangeObject.startContainer.childNodes.length;
}
if (Node.ELEMENT_NODE === backupRangeObject.endContainer.nodeType
&& backupRangeObject.endContainer.childNodes
&& backupRangeObject.endContainer.childNodes.length < backupRangeObject.endOffset
) {
backupRangeObject.endOffset = backupRangeObject.endContainer.childNodes.length;
rangeObject.endOffset = backupRangeObject.endContainer.childNodes.length;
if (backupRangeObject.startContainer) {
//After the zapping we have to check for wrong offsets
if (Node.ELEMENT_NODE === backupRangeObject.startContainer.nodeType
&& backupRangeObject.startContainer.childNodes
&& backupRangeObject.startContainer.childNodes.length < backupRangeObject.startOffset
) {
backupRangeObject.startOffset = backupRangeObject.startContainer.childNodes.length;
rangeObject.startOffset = backupRangeObject.startContainer.childNodes.length;
}
if (Node.ELEMENT_NODE === backupRangeObject.endContainer.nodeType
&& backupRangeObject.endContainer.childNodes
&& backupRangeObject.endContainer.childNodes.length < backupRangeObject.endOffset
) {
backupRangeObject.endOffset = backupRangeObject.endContainer.childNodes.length;
rangeObject.endOffset = backupRangeObject.endContainer.childNodes.length;
}
}
rangeObject.endContainer = backupRangeObject.endContainer;
rangeObject.endOffset = backupRangeObject.endOffset;
Expand Down
7 changes: 7 additions & 0 deletions src/plugins/common/list/lib/list-plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ define([
onToggle: function (activated) {
ListPlugin.transformList('ol');
},
secondaryVisible: (ListPlugin.templates['ol'] || []).slice(0).length > 0,
}));

ListPlugin.unorderedListButton = Ui.adopt('listUnordered', ToggleSplitButton, /** @type {ToggleSplitButton} */ ({
Expand All @@ -170,6 +171,7 @@ define([
onToggle: function (activated) {
ListPlugin.transformList('ul');
},
secondaryVisible: (ListPlugin.templates['ul'] || []).slice(0).length > 0,
}));

ListPlugin.definitionListButton = Ui.adopt('listDefinition', ToggleSplitButton, /** @type {ToggleSplitButton} */ ({
Expand All @@ -184,6 +186,7 @@ define([
onToggle: function (activated) {
ListPlugin.transformList('dl');
},
secondaryVisible: (ListPlugin.templates['dl'] || []).slice(0).length > 0,
}));

ListPlugin._indentListButton = Ui.adopt('indentList', Button, {
Expand Down Expand Up @@ -1139,6 +1142,10 @@ define([
}
}

if (!domToTransform || !domToTransform.nodeName) {
return;
}

// check the dom object
nodeName = domToTransform.nodeName.toLowerCase();

Expand Down