holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove (unnecessary) import statements and fix url for notificationpopup

Browse Source
This commit is contained in:
Ralf Becker 2021-07-08 16:09:21 +02:00
parent a63b82d34e
commit 29acd3ddc9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
notifications/inc/hook_after_navbar.inc.php
View File

@ -25,9 +25,9 @@ if ($GLOBALS['egw_info']['user']['apps']['notifications'])
'etag' => Api\Translation::etag('notifications', Api\Translation::$userlang) 'etag' => Api\Translation::etag('notifications', Api\Translation::$userlang)
); );
$popup_poll_interval = empty($notification_config['popup_poll_interval']) ? 60 : $notification_config['popup_poll_interval']; $popup_poll_interval = empty($notification_config['popup_poll_interval']) ? 60 : $notification_config['popup_poll_interval'];
$minjs = $GLOBALS['egw_info']['server']['debug_minify'] === 'True' ? '' : '.min'; $path = '/notifications/js/notificationajaxpopup';
echo '<script src="'. $GLOBALS['egw_info']['server']['webserver_url']. '/notifications/js/notificationajaxpopup'.$minjs.'.js?'. $path .= file_exists(EGW_SERVER_ROOT.$path.'.min.js') ? '.min.js' : '.js';
filemtime(EGW_SERVER_ROOT.'/notifications/js/notificationajaxpopup'.$minjs.'.js'). echo '<script src="'. $GLOBALS['egw_info']['server']['webserver_url']. $path.'?'.filemtime(EGW_SERVER_ROOT.$path).
'" type="module" id="notifications_script_id" data-poll-interval="'.$popup_poll_interval. '" type="module" id="notifications_script_id" data-poll-interval="'.$popup_poll_interval.
'" data-langRequire="'. htmlspecialchars(json_encode($langRequire)).'"></script>'; '" data-langRequire="'. htmlspecialchars(json_encode($langRequire)).'"></script>';
echo ' echo '

2
notifications/js/notificationajaxpopup.js
View File

@ -11,8 +11,6 @@
'use strict'; 'use strict';
import "../../api/js/jsapi/egw_ready.js";
import "../../api/js/framework/fw_base.js";
/** /**
* Installs app.notifications used to poll notifications from server and display them * Installs app.notifications used to poll notifications from server and display them
*/ */