tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '943-header-refresh-no-stops-in-events-view-dev' into 'develop' 

Removed old code that breaks the autorefresh pause

See merge request !538
This commit is contained in:
vgilc 2017-06-01 09:32:42 +02:00
parent 40cc85ab43 4ba94f065e
commit 3aa4fc7315
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_ui.php
View File

@ -1300,8 +1300,8 @@ function ui_process_page_head ($string, $bitfield) {
$_GET['sec2'] == 'enterprise/dashboard/main_dashboard') { $_GET['sec2'] == 'enterprise/dashboard/main_dashboard') {
$query = ui_get_url_refresh (false, false); $query = ui_get_url_refresh (false, false);
$output .= '<meta http-equiv="refresh" content="' . //$output .= '<meta http-equiv="refresh" content="' .
$config_refr . '; URL=' . $query . '" />'; //$config_refr . '; URL=' . $query . '" />';
} }
} }

6
pandora_console/include/javascript/pandora_events.js
View File

@ -46,6 +46,7 @@ function show_event_dialog(event_id, group_rep, dialog_page, result) {
modal: true, modal: true,
close: function() { close: function() {
$("#refrcounter").countdown("resume"); $("#refrcounter").countdown("resume");
$('div.vc-countdown').countdown('resume');
}, },
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
@ -55,8 +56,9 @@ function show_event_dialog(event_id, group_rep, dialog_page, result) {
height: 530 height: 530
}) })
.show (); .show ();
$("#refrcounter").countdown("pause"); $("#refrcounter").countdown('pause');
$('div.vc-countdown').countdown('pause');
switch (result) { switch (result) {
case 'comment_ok': case 'comment_ok':