Skip to content

Commit 39e6974

Browse files
author
Till Brehm
committed
Merge branch '5119-datalogtimer-is-not-defined-2' into 'develop'
Resolve "dataLogTimer is not defined" Closes #5119 See merge request ispconfig/ispconfig3!1221
2 parents 1ad2076 + 315b472 commit 39e6974

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

interface/web/themes/default/assets/javascripts/ispconfig.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ var ISPConfig = {
176176
ISPConfig.onAfterContentLoad(target, $('#'+formname).serialize());
177177
ISPConfig.pageFormChanged = false;
178178
}
179-
clearTimeout(dataLogTimer);
179+
clearTimeout(ISPConfig.dataLogTimer);
180180
ISPConfig.dataLogNotification();
181181
ISPConfig.hideLoadIndicator();
182182
},
@@ -285,7 +285,7 @@ var ISPConfig = {
285285
ISPConfig.onAfterContentLoad(pagename, (params ? params : null));
286286
ISPConfig.pageFormChanged = false;
287287
}
288-
clearTimeout(dataLogTimer); // clear running dataLogTimer
288+
clearTimeout(ISPConfig.dataLogTimer); // clear running dataLogTimer
289289
ISPConfig.dataLogNotification();
290290
ISPConfig.hideLoadIndicator();
291291
},
@@ -514,12 +514,12 @@ var ISPConfig = {
514514
$('.modal-body').html(dataLogItems.join(""));
515515
$('.notification_text').text(data['count']);
516516
$('.notification').css('display','');
517-
dataLogTimer = setTimeout( function() { ISPConfig.dataLogNotification(); }, 2000 );
517+
ISPConfig.dataLogTimer = setTimeout( function() { ISPConfig.dataLogNotification(); }, 2000 );
518518
} else {
519519
$('.notification').css('display','none');
520520
$('.modal-body').html('');
521521
$('#datalogModal').modal('hide');
522-
dataLogTimer = setTimeout( function() { ISPConfig.dataLogNotification(); }, 5000 );
522+
ISPConfig.dataLogTimer = setTimeout( function() { ISPConfig.dataLogNotification(); }, 5000 );
523523
}
524524
},
525525
error: function() {

interface/web/themes/default/assets/javascripts/ispconfig.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)