Fix: Use undefined instead of null | fix '/threads' bug

plibither8 · Apr 7, 2019 · e204868 · e204868
1 parent e9f8d5b
commit e204868
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/features/comments-ui-tweaks.js b/src/features/comments-ui-tweaks.js
@@ -6,8 +6,12 @@ import {paths} from '../libs/paths';
 async function init(metadata) {
 	const me = metadata.user.name;
 
-	const itemId = getUrlParams('id');
-	const op = itemId ? (await getItemInfo(itemId)).by : null;
+	let op;
+
+	if (metadata.path === '/item') {
+		const itemId = getUrlParams('id');
+		op = itemId ? (await getItemInfo(itemId)).by : undefined;
+	}
 
 	const comments = getAllComments();
 

diff --git a/src/features/toggle-all-comments-and-replies.js b/src/features/toggle-all-comments-and-replies.js
@@ -7,7 +7,7 @@ function toggleAllReplies() {
 	allComments.forEach((comment, id) => {
 		const currentIndent = comment.querySelector('td.ind img').width / 40;
 		const nextIndent = id + 1 === allComments.length ?
-			null :
+			undefined :
 			allComments[id + 1].querySelector('td.ind img').width / 40;
 
 		if (nextIndent && nextIndent > currentIndent) {

diff --git a/src/libs/dom-utils.js b/src/libs/dom-utils.js
@@ -58,13 +58,13 @@ export function getGroupedStories(itemlist) {
 		const storyUrl = rows[i].querySelector('a.storylink').href;
 
 		const scoreSpan = rows[i + 1].querySelector('span.score');
-		const score = scoreSpan ? parseInt(scoreSpan.innerText, 10) : null;
+		const score = scoreSpan ? parseInt(scoreSpan.innerText, 10) : undefined;
 
 		const defaultRank = parseInt(rows[i].querySelector('span.rank').innerText, 10);
 
 		const commentsLink = [...rows[i + 1].querySelectorAll('a')]
 			.find(a => a.innerText.includes('comment') || a.innerText.includes('discuss'));
-		const commentsCount = commentsLink ? parseInt(commentsLink.innerText, 10) : null;
+		const commentsCount = commentsLink ? parseInt(commentsLink.innerText, 10) : undefined;
 
 		const elements = [
 			rows[i],

diff --git a/src/libs/initialise.js b/src/libs/initialise.js
@@ -64,20 +64,20 @@ const featureList = [
 const getMetadata = new Promise(resolve => {
 	const metadata = {
 		path: window.location.pathname,
-		itemId: null,
+		itemId: undefined,
 		user: {
 			loggedIn: false,
-			name: null
+			name: undefined
 		},
 		isJob: false,
-		options: null,
+		options: undefined,
 		firstLoad: false
 	};
 
 	window.addEventListener('load', async () => {
 		metadata.itemId = getUrlParams('id');
 		metadata.user.loggedIn = isLoggedIn();
-		metadata.user.name = metadata.user.loggedIn ? getLoggedInUser() : null;
+		metadata.user.name = metadata.user.loggedIn ? getLoggedInUser() : undefined;
 		metadata.isJob = (metadata.itemId && metadata.path === '/item') ? await isItemJob(metadata.itemId) : false;
 		metadata.options = await getOptions;
 		resolve(metadata);