From 00a038d64624ec8cfb91bc031c100698cdb54397 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Fri, 8 May 2020 09:19:48 +0200 Subject: [PATCH] REFACTOR: removes various assignments and superfluous params (#9699) --- .../javascripts/discourse/app/models/topic-tracking-state.js | 3 +-- app/assets/javascripts/locales/i18n.js | 1 - .../addon/engines/discourse-markdown/bbcode-inline.js | 2 +- .../pretty-text/addon/engines/discourse-markdown/html-img.js | 2 +- .../pretty-text/addon/engines/discourse-markdown/paragraph.js | 2 +- app/assets/javascripts/pretty-text/addon/oneboxer.js | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js index 7cb74d88453..be49ad4b39e 100644 --- a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js +++ b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js @@ -452,14 +452,13 @@ const TopicTrackingState = EmberObject.extend({ } let categoryId = category ? get(category, "id") : null; - let categoryName = category ? get(category, "name") : null; if (name === "new") { return this.countNew(categoryId); } else if (name === "unread") { return this.countUnread(categoryId); } else { - categoryName = name.split("/")[1]; + const categoryName = name.split("/")[1]; if (categoryName) { return this.countCategory(categoryId); } diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js index e0f7019a08e..480287700ab 100644 --- a/app/assets/javascripts/locales/i18n.js +++ b/app/assets/javascripts/locales/i18n.js @@ -197,7 +197,6 @@ I18n.toNumber = function(number, options) { .toFixed(options.precision) .toString(), parts = string.split(this.SEPARATOR), - precision, buffer = [], formattedNumber; diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-inline.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-inline.js index 98788ae063d..ab57fcb7165 100644 --- a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-inline.js +++ b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/bbcode-inline.js @@ -225,7 +225,7 @@ export function setup(helper) { token = state.push("text", "", 0); token.content = content; - token = state.push("link_close", "a", -1); + state.push("link_close", "a", -1); return true; } }); diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/html-img.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/html-img.js index bdc61788f57..800d520a9e2 100644 --- a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/html-img.js +++ b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/html-img.js @@ -66,7 +66,7 @@ function rule(state, startLine, endLine) { token.map = [startLine, state.line]; token.children = []; - token = state.push("paragraph_close", "p", -1); + state.push("paragraph_close", "p", -1); state.parentType = oldParentType; return true; diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/paragraph.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/paragraph.js index 267317589e1..879faf95dde 100644 --- a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/paragraph.js +++ b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown/paragraph.js @@ -78,7 +78,7 @@ function paragraph(state, startLine /*, endLine*/) { // CUSTOM token.leading_space = hasLeadingSpace; - token = state.push("paragraph_close", "p", -1); + state.push("paragraph_close", "p", -1); state.parentType = oldParentType; return true; diff --git a/app/assets/javascripts/pretty-text/addon/oneboxer.js b/app/assets/javascripts/pretty-text/addon/oneboxer.js index f5faf561281..e0720c3cadb 100644 --- a/app/assets/javascripts/pretty-text/addon/oneboxer.js +++ b/app/assets/javascripts/pretty-text/addon/oneboxer.js @@ -78,7 +78,7 @@ function loadNext(ajax) { let $html = $(html); setLocalCache(normalize(url), $html); $elem.replaceWith($html); - applySquareGenericOnebox($html, normalize(url)); + applySquareGenericOnebox($html); }, result => { if (result && result.jqXHR && result.jqXHR.status === 429) {