kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4763 from thabaum/ScrollTo-interop-modal

Browse Source 
Fixes #4762: Adds logic ScrollTo interop.js method detecting if method is executed inside a modal
This commit is contained in:
Shaun Walker 2024-10-22 16:28:45 -04:00 committed by GitHub
commit 992a786c2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Oqtane.Maui/wwwroot/js/interop.js
View File

@ -417,11 +417,20 @@ Oqtane.Interop = {
} }
}, },
scrollTo: function (top, left, behavior) { scrollTo: function (top, left, behavior) {
window.scrollTo({ const modal = document.querySelector('.modal');
top: top, if (modal) {
left: left, modal.scrollTo({
behavior: behavior top: top,
}); left: left,
behavior: behavior
});
} else {
window.scrollTo({
top: top,
left: left,
behavior: behavior
});
}
}, },
scrollToId: function (id) { scrollToId: function (id) {
var element = document.getElementById(id); var element = document.getElementById(id);

19
Oqtane.Server/wwwroot/js/interop.js
View File

@ -417,11 +417,20 @@ Oqtane.Interop = {
} }
}, },
scrollTo: function (top, left, behavior) { scrollTo: function (top, left, behavior) {
window.scrollTo({ const modal = document.querySelector('.modal');
top: top, if (modal) {
left: left, modal.scrollTo({
behavior: behavior top: top,
}); left: left,
behavior: behavior
});
} else {
window.scrollTo({
top: top,
left: left,
behavior: behavior
});
}
}, },
scrollToId: function (id) { scrollToId: function (id) {
var element = document.getElementById(id); var element = document.getElementById(id);