Fix bug that meant QR code wasn't showing on mobile view if text hidden

thexerteproject · Nov 5, 2023 · 1e09e6b · 1e09e6b
1 parent 85a63f0
commit 1e09e6b
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/QRcode.html b/modules/xerte/parent_templates/Nottingham/models_html5/QRcode.html
@@ -118,14 +118,17 @@
 			// ** when hide text is on
 			var imgMaxW, imgMaxH,
 				imageSize = x_currentPageXML.getAttribute("imagesize");
-
-			if (x_currentPageXML.getAttribute("align") == "Hide text") {
+
+			if (x_browserInfo.mobile == true) {
+				imgMaxW = 250; // mobile
+				imgMaxH = 250;
+			} else if (x_currentPageXML.getAttribute("align") == "Hide text") {
 				imgMaxW = $x_pageDiv.width();
 				imgMaxH = $x_pageHolder.height() - ($x_pageDiv.outerHeight() - $x_pageDiv.height());
 				imgMaxW -= ($("#imgHolder .panel").outerWidth() - $("#imgHolder .panel").width());
 				imgMaxH -= ($("#imgHolder .panel").outerHeight() - $("#imgHolder .panel").height());
 
-			} else if (imageSize != undefined && x_browserInfo.mobile != true) {
+			} else if (imageSize != undefined) {
 				imgMaxW = $x_pageDiv.width();
 				imgMaxH = $x_pageHolder.height() - ($x_pageDiv.outerHeight() - $x_pageDiv.height());
 
@@ -143,18 +146,13 @@
 			} else { // fixed (this isn't an option now but was default before imagesize added to xwd)
 				imgMaxW = 400; // desktop / tablet
 				imgMaxH = 400;
-				if (x_browserInfo.mobile == true) {
-					imgMaxW = 250; // mobile
-					imgMaxH = 250;
-				}
 			}
 
 			imgMaxH -= $("#shorturltodisplay").outerHeight();
 
 			if (x_currentPageXML.getAttribute("sound") != undefined && x_currentPageXML.getAttribute("sound") != "") {
 				imgMaxH -= x_audioBarH;
 			}
-
 			return {width: Math.min(imgMaxW, imgMaxH), height: Math.min(imgMaxW, imgMaxH)};
 		}