Skip to content
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

SHS-5955: When first adding Footer Social Media Links there is strange scrolling when adding another link #1709

Merged
merged 6 commits into from
Jan 14, 2025
Merged

SHS-5955: When first adding Footer Social Media Links there is strange scrolling when adding another link #1709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db2e6db
fix(SHS-5955): Apply patch to block_class module to fix modal scrolli…
codechefmarc Jan 7, 2025
77f5029
feat(SHS-5955): Update block_class to version 4
codechefmarc Jan 7, 2025
7b4fa6d
Merge branch 'develop' into SHS-5955--fix-modal-scroll
ahughes3 Jan 13, 2025
bd1f604
Merge branch '11.6.3-release' into SHS-5955--fix-modal-scroll
codechefmarc Jan 13, 2025
9eda02b
refactor(SHS-5955): Replace patch URL with local patch
codechefmarc Jan 13, 2025
02902db
fix(SHS-5955): Fix codeclimate error
codechefmarc Jan 14, 2025
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
5 changes: 4 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"drupal/auto_entitylabel": "^3.0@beta",
"drupal/better_exposed_filters": "^7.0",
"drupal/better_normalizers": "^2.0",
"drupal/block_class": "^2.0",
"drupal/block_class": "^4.0",
"drupal/block_content_permissions": "^1.10",
"drupal/cancel_button": "^1.1",
"drupal/chosen": "^4.0",
Expand Down Expand Up @@ -229,6 +229,9 @@
"extra": {
"enable-patching": true,
"patches": {
"drupal/block_class": {
"Click JavaScript to close details causes modals to scroll unnecessarily https://www.drupal.org/project/block_class/issues/3497768": "patches/contrib/block_class/60.patch"
},
"drupal/config_ignore": {
"https://www.drupal.org/project/config_ignore/issues/2857247": "https://www.drupal.org/files/issues/2020-01-11/support-for-export-2857247-44.patch",
"https://www.drupal.org/project/config_ignore/issues/2865419": "https://www.drupal.org/files/issues/2020-07-20/config_ignore-wildcard_force_import.patch"
Expand Down
16 changes: 8 additions & 8 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,6 +1193,6 @@ function su_humsci_profile_update_9721() {
\Drupal::service('module_installer')->uninstall([
'honeypot',
'hs_paragraphs_between',
'paragraphs_browser'
'paragraphs_browser',
]);
}
30 changes: 30 additions & 0 deletions patches/contrib/block_class/60.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From d7b41e153f421a416fdd66572a6767efd14f8e8a Mon Sep 17 00:00:00 2001
From: sandippoddar <sandip.poddar@innoraft.com>
Date: Tue, 7 Jan 2025 12:36:41 +0530
Subject: [PATCH] Issue #3497768: Click JavaScript to close details causes
modals to scroll unnecessarily

---
js/block-class.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/block-class.js b/js/block-class.js
index 9eedf9b..343285c 100644
--- a/js/block-class.js
+++ b/js/block-class.js
@@ -19,10 +19,10 @@
$('.show-items-used').css( "display", "none" );

// Collapse the details field when the Modal is open.
- $('.replaced-id-details').find('summary').trigger( "click" );
+ $('.replaced-id-details').removeAttr("open");

// Collapse the attribute as well on this scenario.
- $('.attribute-details').find('summary').trigger( "click" );
+ $('.attribute-details').removeAttr("open");

}

--
GitLab

Loading