mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-03-18 18:40:58 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -98,7 +98,7 @@
|
||||
"multer": "2.1.1",
|
||||
"nconf": "0.13.0",
|
||||
"nodebb-plugin-2factor": "7.6.1",
|
||||
"nodebb-plugin-composer-default": "10.3.23",
|
||||
"nodebb-plugin-composer-default": "10.3.25",
|
||||
"nodebb-plugin-dbsearch": "6.4.0",
|
||||
"nodebb-plugin-emoji": "6.0.6",
|
||||
"nodebb-plugin-emoji-android": "4.1.1",
|
||||
|
||||
@@ -42,25 +42,10 @@ app = window.app || {};
|
||||
}]);
|
||||
});
|
||||
};
|
||||
let hasInteracted = false;
|
||||
|
||||
function onInteraction() {
|
||||
if (!hasInteracted && parseInt(app.user.uid, 10) >= 0) {
|
||||
hasInteracted = true;
|
||||
addHandlers();
|
||||
socket.connect();
|
||||
document.removeEventListener('mousemove', onInteraction);
|
||||
document.removeEventListener('keydown', onInteraction);
|
||||
document.removeEventListener('touchstart', onInteraction);
|
||||
}
|
||||
}
|
||||
if (location.pathname.startsWith(config.relative_path + '/admin')) {
|
||||
if (parseInt(app.user.uid, 10) >= 0) {
|
||||
addHandlers();
|
||||
socket.connect();
|
||||
} else {
|
||||
document.addEventListener('mousemove', onInteraction);
|
||||
document.addEventListener('keydown', onInteraction);
|
||||
document.addEventListener('touchstart', onInteraction);
|
||||
}
|
||||
|
||||
window.app.reconnect = (showAlert = false) => {
|
||||
|
||||
Reference in New Issue
Block a user