8000 Fixed a bug with expanding static placeholder by clicking on "Expand … · django-cms/django-cms@9d19af9 · GitHub
[go: up one dir, main page]

Skip to content

Commit 9d19af9

Browse files
committed
Fixed a bug with expanding static placeholder by clicking on "Expand All" button
Conflicts: cms/static/cms/js/dist/3.5.2/bundle.toolbar.min.js
1 parent 9e1cc32 commit 9d19af9

File tree

3 files changed

+8
-3
lines changed
< 10000 button data-component="IconButton" type="button" data-testid="collapse-file-tree-button" aria-expanded="true" aria-controls="diff_file_tree" class="prc-Button-ButtonBase-c50BI d-none d-md-flex position-relative fgColor-muted prc-Button-IconButton-szpyj" data-loading="false" data-no-visuals="true" data-size="medium" data-variant="invisible" aria-describedby=":R72plab:-loading-announcement" aria-labelledby=":R12plab:">

3 files changed

+8
-3
lines changed

CHANGELOG.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* Fixed a bug where cached page permissions overrides global permissions
1616
* Fixed a bug where plugins that are not rendered in content wouldn't be
1717
editable in structure board
18+
* Fixed a bug with expanding static placeholder by clicking on "Expand All" button
1819

1920

2021
=== 3.5.2 (2018-04-11) ===

cms/static/cms/js/dist/3.5.2/bundle.toolbar.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cms/static/cms/js/modules/cms.plugins.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1978,9 +1978,13 @@ Plugin._initializeGlobalHandlers = function _initializeGlobalHandlers() {
19781978
});
19791979

19801980
$document.on(Plugin.click, '.cms-dragarea-static .cms-dragbar', e => {
1981-
if (!e.isDefaultPrevented()) {
1982-
$(e.target).closest('.cms-dragarea').toggleClass('cms-dragarea-static-expanded');
1981+
const placeholder = $(e.target).closest('.cms-dragarea');
1982+
1983+
if (placeholder.hasClass('cms-dragarea-static-expanded') && e.isDefaultPrevented()) {
1984+
return;
19831985
}
1986+
1987+
placeholder.toggleClass('cms-dragarea-static-expanded');
19841988
});
19851989

19861990
$window.on('blur.cms', () => {

0 commit comments

Comments
 (0)
0