костыль для Pale Moon

maxcom · Jan 9, 2025 · ee5acad · ee5acad
1 parent 0421e6a
commit ee5acad
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/main/webapp/WEB-INF/tags/image.tag b/src/main/webapp/WEB-INF/tags/image.tag
@@ -28,7 +28,6 @@
 <c:set var="heightLimitValue" value="${(empty heightLimit) ? '90vh' : heightLimit}" />
 
 <c:if test="${showImage!=null and showImage and image!=null}">
-  <%-- width продублирован Pale Moon и других для браузеров, не умеющих min() --%>
   <div class="medium-image-container" style="max-width: <%= Math.min(image.getFullInfo().getWidth(), Image.MaxScaledSize()) %>px; max-height: ${heightLimitValue};
     width: var(--image-width); width: min(var(--image-width), calc(${heightLimitValue} * ${image.mediumInfo.width} / ${image.mediumInfo.height}))">
   <figure class="medium-image" <%-- padding продублирован Pale Moon и других для браузеров, не умеющих min() --%>

diff --git a/src/main/webapp/WEB-INF/tags/imageslider.tag b/src/main/webapp/WEB-INF/tags/imageslider.tag
@@ -22,8 +22,7 @@
 <%@ attribute name="additional" required="true" type="java.util.List<ru.org.linux.topic.PreparedImage>" %>
 <%@ attribute name="heightLimit" required="false" type="java.lang.String" %>
 <c:set var="heightLimitValue" value="${(empty heightLimit) ? '90vh' : heightLimit}" />
-<%-- width продублирован Pale Moon и других для браузеров, не умеющих min() --%>
-<div class="slider-parent" style="width: var(--image-width); width: min(var(--image-width), calc(${heightLimitValue} * ${main.mediumInfo.width} / ${main.mediumInfo.height}))">
+<div class="slider-parent" style="width: min(var(--image-width), calc(${heightLimitValue} * ${main.mediumInfo.width} / ${main.mediumInfo.height}))">
   <div class="swiffy-slider slider-indicators-round ${classes} slider-item-ratio slider-item-ratio-contain"
        style="--swiffy-slider-item-ratio: ${main.fullInfo.width}/${main.fullInfo.height}">
     <div class="slider-container">

diff --git a/src/main/webapp/js/lor.js b/src/main/webapp/js/lor.js
@@ -522,6 +522,18 @@ $(document).ready(function() {
   initCodeSpoilers();
   initReactionsUI();
 
+  // fix images on Pale Moon
+  $('.medium-image-container').each(function() {
+    if ($(this).width() == 0) {
+        $(this).css('width', 'var(--image-width)')
+    }
+  });
+  $('.slider-parent').each(function() {
+    if ($(this).height() <= 48) {
+        $(this).css('width', 'var(--image-width)')
+    }
+  });
+
   $script.ready('plugins', function () {
     if (window.matchMedia("(min-width: 70em)").matches) {
       $(".msg_body .swiffy-slider").addClass("slider-nav-outside-expand").addClass("slider-nav-visible");