Update new files size

Author: IMC-GER

imcger/imgupload/controller/save_rotated_img_controller.php

@@ -46,6 +46,8 @@ class save_rotated_img_controller
 	protected $php_ext;
 
 	/**
+	 * Constructor for ajax controller
+	 *
 	 * @param \phpbb\config\config				$config
 	 * @param \phpbb\user						$user
 	 * @param \phpbb\request\request			$request
@@ -93,7 +95,7 @@ public function __construct(
 	 * @var 	int		creation_time	creation time of token
 	 * @var 	string	form_token		form token
 	 *
-	 * @return	array	Json arry with status, old and new attach id or error message
+	 * @return	array	Json arry with status, old and new attach id, new file size or error message
 	 */
 	public function save_image()
 	{
@@ -215,6 +217,7 @@ private function rotate_image($path, $deg)
 	 * @param 	string	$message		Messagebox message
 	 * @param	int		$old_attach_id	Previous attachment id
 	 * @param 	int		$new_attach_id	New attachment id
+	 * @param 	int		$file_size		New file size
 	 *
 	 * @return	string	$json
 	 */

imcger/imgupload/styles/all/template/event/overall_footer_body_after.html

@@ -141,16 +141,17 @@
 		},
 
 		/**
-		 * Subroutine for converting the file size into a string
+		 * Converting the file size into a string and update the row
 		 *
+		 * @param	int		attach_id	attach id from image
 		 * @param	int		fileSize	file size in byte
-		 *
-		 * @return	string	strFileSize	file size as byte, KiB or MiB
 		 */
-		sizeToString: function(fileSize) {
+		updateImgFileSize: function(attach_id, fileSize) {
 			let	strFileSize = '';
 
-			fileSize = parseInt(fileSize);
+			if (isNaN(fileSize)) {
+				return;
+			}
 
 			if (fileSize < 1024) {
 				strFileSize = fileSize + ' {{ lang("BYTES_SHORT")|e("js") }}';
@@ -160,7 +161,9 @@
 				strFileSize = Math.round(fileSize / 10485.76) / 100  + ' {{ lang("MIB")|e("js") }}';
 			}
 
-			return(strFileSize);
+			if (strFileSize) {
+				$('.attach-row[data-attach-id="' + attach_id + '"] .file-size').html(strFileSize);
+			}
 		},
 
 		/**
@@ -236,22 +239,11 @@
 								'&form_token=' + $('input[name="form_token"]').val();
 
 			let ajaxReq = $.ajax({
-				// The url of the request
 				url: url,
-
-				// The data to send
 				data: requestData,
-
-				// Whether this is a POST or GET request
 				type: 'POST',
-
-				// The type of data we expect back
 				dataType: "json",
-
-				// Set a timeout (in milliseconds) for the request
 				timeout: 10000,
-
-				// Code to run before the request is send
 				beforeSend: function(xhr, settings) {
 					$(button).find('>:first-child').attr('class', 'icon fa-refresh fa-spin fa-fw');
 					$('.imcger-iupl-button button').prop('disabled', true).css('cursor','not-allowed');
@@ -269,15 +261,7 @@
 				if (response.status < 3) {
 					imcger.imgUpload.updateAttId(response.oldAttachId, response.newAttachId);
 					imcger.imgUpload.image.imgOrientationValue[index] = 0;
-
-					// Update row with new image size
-					if (response.fileSize) {
-						let strFileSize = imcger.imgUpload.image.sizeToString(response.fileSize);
-
-						if (strFileSize) {
-							$('.attach-row[data-attach-id="' + response.newAttachId + '"] .file-size').html(strFileSize);
-						}
-					}
+					imcger.imgUpload.image.updateImgFileSize(response.newAttachId, response.fileSize);
 
 					// Display a message when a warning occurs
 					if (response.message) {
@@ -322,24 +306,19 @@
 				});
 
 			ajaxReq.done(function(response, status, xhr) {
-				let strFileSize = imcger.imgUpload.image.sizeToString(xhr.getResponseHeader('Content-Length'));
-
-				if (strFileSize) {
-					$('.attach-row[data-attach-id="' + attach_id + '"] .file-size').html(strFileSize);
-				}
+				imcger.imgUpload.image.updateImgFileSize(attach_id, xhr.getResponseHeader('Content-Length'));
 			});
 		},
 	}
 
 	/**
 	 * Remove attachment in preview when insert as img BBcode in message
 	 * AddOn for editor.js
-	 *
-	 * @var	array	notDisplayedAttachments	Attachments that insert in the message
-	 * @var	bool	notDisplayAttachmentBox	Don't show any attachment
 	 */
 	imcger.imgUpload.showAttachImage = function() {
+			  // Attachments that insert in the message
 		const notDisplayedAttachments = {{ IUL_NOT_DISPLAYED_ATTACHMENTS }},
+			  // If true don't show the attachment box
 			  notDisplayAttachmentBox = {{ IUL_NOT_DISPLAY_ATTACHMENTBOX }};
 
 		// Return when no attachments present
@@ -449,8 +428,6 @@
 	/**
 	 * Update the relevant elements and hidden data for
 	 * an attachment when page load.
-	 *
-	 * @param void
 	 */
 	imcger.imgUpload.updateRow = function() {
 		$('.file-name.ellipsis-text a').each(function() {
@@ -513,8 +490,10 @@
 				$('#img-' + attach_id).on('load', function(e) {
 					let imgHeight = maxImgHeight;
 
-					// The $(this) element work not all time
-					if (e.target.height < e.target.width) {
+					// $(this).height() don't work all time
+					if (e.target.height < maxImgHeight) {
+						imgHeight = e.target.height;
+					} else if (e.target.height < e.target.width) {
 						imgHeight = maxImgHeight / e.target.width * e.target.height;
 					}
 
@@ -598,8 +577,10 @@
 				$('#img-' + attach.attach_id).on('load', function(e) {
 					let imgHeight = maxImgHeight;
 
-					// The $(this) element work not all time
-					if (e.target.height < e.target.width) {
+					// $(this).height() don't work all time
+					if (e.target.height < maxImgHeight) {
+						imgHeight = e.target.height;
+					} else if (e.target.height < e.target.width) {
 						imgHeight = maxImgHeight / e.target.width * e.target.height;
 					}