From 1107de31a895701998a4bcc33c0fc86be7abaeb3 Mon Sep 17 00:00:00 2001 From: Pouryafard75 Date: Sun, 7 Jul 2024 02:55:42 -0400 Subject: [PATCH] ASTDiff GUI: Final fixes --- .../java/gui/webdiff/DirectoryDiffView.java | 15 +++++++++++-- src/main/resources/web/dist/single.js | 21 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/main/java/gui/webdiff/DirectoryDiffView.java b/src/main/java/gui/webdiff/DirectoryDiffView.java index 232aef238f..436c890755 100644 --- a/src/main/java/gui/webdiff/DirectoryDiffView.java +++ b/src/main/java/gui/webdiff/DirectoryDiffView.java @@ -46,7 +46,7 @@ public void renderOn(HtmlCanvas html) throws IOException { .body() .div(class_("container-fluid").style("padding: 0;")) .div(class_("row")) - .render(new MenuBar()) + .render(new MenuBar(external)) ._div() .if_(!external) .div(class_("row justify-content-center")) @@ -271,13 +271,24 @@ public void renderOn(HtmlCanvas html) throws IOException { } private static class MenuBar implements Renderable { + private final boolean external; + + public MenuBar(boolean external) { + this.external = external; + } + @Override public void renderOn(HtmlCanvas html) throws IOException { html .div(class_("col")) .div(class_("btn-toolbar justify-content-end")) - .div(class_("btn-group")) + .div(class_("btn-group").style("padding: 5px;")) + .if_(!external) .a(class_("btn btn-default btn-sm btn-danger").href("/quit")).content("Quit") + ._if() + .if_(external) + .a(class_("btn btn-default btn-sm btn-danger").href("/list")).content("Back") + ._if() ._div() ._div() ._div(); diff --git a/src/main/resources/web/dist/single.js b/src/main/resources/web/dist/single.js index 5078407de4..38571526ef 100644 --- a/src/main/resources/web/dist/single.js +++ b/src/main/resources/web/dist/single.js @@ -1,4 +1,25 @@ $(document).ready(function() { + + function resizeAllIframes() { + $('iframe').each(function() { + var iframe = this; + $(iframe).on('load', function() { + var height = iframe.contentWindow.document.body.scrollHeight; + // console.log(height); + iframe.style.height = height + 'px'; + }); + + }); + } + + $('iframe').on('load', function() { + resizeAllIframes(); + }); + + $(window).resize(function() { + resizeAllIframes(); + }); + // Select all elements with an ID that starts with 'diff_row_' $('[id^="diff_row_"]').each(function() { // Update the href attribute of each selected element