From 9834da71d0ef321f24986edd79b0f6997c449ed4 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Thu, 2 Aug 2018 16:31:51 +0200
Subject: [PATCH] Add notifications into minifying js files

---
 Gruntfile.js                                | 7 +++++++
 notifications/inc/hook_after_navbar.inc.php | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 5d8e815573..c22f633b57 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -247,6 +247,13 @@ module.exports = function (grunt) {
 					]
 				}
 			},
+			notifications: {
+				files: {
+					"notifications/js/notificationajaxpopup.min.js":[
+						"notifications/js/notificationajaxpopup.js"
+					]
+				}
+			},
 			pixelegg: {
 				files: {
 					"pixelegg/js/fw_pixelegg.min.js": [
diff --git a/notifications/inc/hook_after_navbar.inc.php b/notifications/inc/hook_after_navbar.inc.php
index 1da2c5d53a..2c2aa61506 100644
--- a/notifications/inc/hook_after_navbar.inc.php
+++ b/notifications/inc/hook_after_navbar.inc.php
@@ -25,8 +25,9 @@ if ($GLOBALS['egw_info']['user']['apps']['notifications'])
 		'etag'	=> Api\Translation::etag('notifications', Api\Translation::$userlang)
 	);
 	$popup_poll_interval = empty($notification_config['popup_poll_interval']) ? 60 : $notification_config['popup_poll_interval'];
-	echo '<script src="'. $GLOBALS['egw_info']['server']['webserver_url']. '/notifications/js/notificationajaxpopup.js?'.
-		filemtime(EGW_SERVER_ROOT.'/notifications/js/notificationajaxpopup.js').
+	$minjs = $GLOBALS['egw_info']['server']['debug_minify'] === 'True' ? '' : '.min';
+	echo '<script src="'. $GLOBALS['egw_info']['server']['webserver_url']. '/notifications/js/notificationajaxpopup'.$minjs.'.js?'.
+		filemtime(EGW_SERVER_ROOT.'/notifications/js/notificationajaxpopup'.$minjs.'.js').
 		'" type="text/javascript" id="notifications_script_id" data-poll-interval="'.$popup_poll_interval.
 		'" data-langRequire="'. htmlspecialchars(json_encode($langRequire)).'"></script>';
 	echo '