fix: bookmark scroll doing ajaxify

if target post is already on page fix alerts crash due to double close
NodeBB · Aug 22, 2023 · 2e0964e · 2e0964e
1 parent a7a266d
commit 2e0964e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/public/src/client/topic.js b/public/src/client/topic.js
@@ -162,7 +162,7 @@ define('forum/topic', [
 				timeout: 15000,
 				type: 'info',
 				clickfn: function () {
-					navigator.scrollToIndex(parseInt(bookmark, 10), true);
+					navigator.scrollToIndex(Math.max(0, parseInt(bookmark, 10) - 1), true);
 				},
 				closefn: function () {
 					storage.removeItem('topic:' + tid + ':bookmark');

diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js
@@ -90,8 +90,8 @@ function updateAlert(alert, params) {
 			.on('click', function (e) {
 				if (!$(e.target).is('.btn-close')) {
 					params.clickfn();
+					close(alert);
 				}
-				close(alert);
 			});
 	}
 }
@@ -128,8 +128,8 @@ function createNew(params) {
 				.on('click', function (e) {
 					if (!$(e.target).is('.btn-close')) {
 						params.clickfn(alert, params);
+						close(alert);
 					}
-					close(alert);
 				});
 		}