diff --git a/src/main/java/gui/webdiff/viewers/spv/AbstractSinglePageView.java b/src/main/java/gui/webdiff/viewers/spv/AbstractSinglePageView.java index a66e61cb1..36dea69ff 100644 --- a/src/main/java/gui/webdiff/viewers/spv/AbstractSinglePageView.java +++ b/src/main/java/gui/webdiff/viewers/spv/AbstractSinglePageView.java @@ -61,7 +61,7 @@ public void renderOn(HtmlCanvas html) { ._div() ._div() .div(id("collapse-" + i).class_("collapse show").add("aria-labelledby", "heading-" + i)) - .div(class_("card-body").style("padding: 0;")); + .div(class_("card-body").style("overflow: hidden; padding: 0;")); makeEachDiff(html, i, core); html ._div() diff --git a/src/main/resources/web/dist/monaco.css b/src/main/resources/web/dist/monaco.css index f93351402..d697f8a9b 100644 --- a/src/main/resources/web/dist/monaco.css +++ b/src/main/resources/web/dist/monaco.css @@ -100,7 +100,6 @@ div { } #diff_panel { - overflow-y: auto; height: 100%; } /*.deleted {*/ diff --git a/src/main/resources/web/dist/monaco.js b/src/main/resources/web/dist/monaco.js index 200a33dc0..1832deb10 100644 --- a/src/main/resources/web/dist/monaco.js +++ b/src/main/resources/web/dist/monaco.js @@ -8,7 +8,8 @@ function getEditorOptions(config, text) { lineDecorationsWidth: 0, glyphMargin: false, scrollbar: { - alwaysConsumeMouseWheel: false + alwaysConsumeMouseWheel: false, + vertical: config.spv === true ? 'hidden' : 'auto' }, minimap: { enabled: false, diff --git a/src/main/resources/web/dist/single.css b/src/main/resources/web/dist/single.css index 1a0f52d73..f6b2fd2b4 100644 --- a/src/main/resources/web/dist/single.css +++ b/src/main/resources/web/dist/single.css @@ -1,10 +1,17 @@ .monaco-panel { - overflow-y: auto; /* Enable scrollbar for Monaco panel */ + overflow: hidden; /* Disable both vertical and horizontal scrollbars */ + height: 100%; /* Ensure it fills the available height */ } +.dir-diff{ + height: 100%; + overflow-y: scroll; /* Enable vertical scrolling */ + overflow-x: hidden; /* Disable horizontal scrolling */ +} #accordion { - overflow-y: auto; /* Enable scrollbar for accordion */ + overflow-y: scroll; /* Enable vertical scrolling */ + overflow-x: hidden; /* Disable horizontal scrolling */ height: 100%; /* Ensure it fills the available height */ } diff --git a/src/main/resources/web/dist/single.js b/src/main/resources/web/dist/single.js index 11da409b5..88ba82eb8 100644 --- a/src/main/resources/web/dist/single.js +++ b/src/main/resources/web/dist/single.js @@ -1,4 +1,3 @@ -x = 1; $(document).ready(function() { // Select all elements with an ID that starts with 'diff_row_' $('[id^="diff_row_"]').each(function() { @@ -11,7 +10,6 @@ $(document).ready(function() { event.preventDefault(); // Prevent the default anchor behavior var targetId = 'heading-' + id.split('_')[2]; var $target = $('#' + targetId); - x = $target var targetOffset = $('#' + targetId).offset().top; var accordionOffset = $('#accordion').offset().top; var scrollTo = targetOffset - accordionOffset + $('#accordion').scrollTop();