From b61b058824957c76eda0f3fa7a7bdb68da7bcfef Mon Sep 17 00:00:00 2001 From: eight Date: Wed, 13 Sep 2017 17:34:27 +0800 Subject: [PATCH] Fix: pull out makeLink --- content/install-user-css.js | 16 +++------------- edit/lint.js | 7 +------ js/dom.js | 10 ++++++++++ 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/content/install-user-css.js b/content/install-user-css.js index 6dae6687..a54d5671 100644 --- a/content/install-user-css.js +++ b/content/install-user-css.js @@ -1,4 +1,4 @@ -/* global semverCompare */ +/* global semverCompare makeLink */ 'use strict'; @@ -99,8 +99,8 @@ function initInstallPage({style, dup}, sourceLoader) { $element({tag: 'button', className: 'install', textContent: installButtonLabel()}) ]}), $element({className: 'external', appendChild: [ - externalLink('externalHomepage', style.url), - externalLink('externalSupport', style.support) + style.url && makeLink(style.url, t('externalHomepage')), + style.support && makeLink(style.support, t('externalSupport')) ]}) ]}), $element({className: 'main', appendChild: [ @@ -109,16 +109,6 @@ function initInstallPage({style, dup}, sourceLoader) { ]}); } - function externalLink(name, url) { - return $element({ - tag: 'a', - href: url, - target: '_blank', - textContent: t(name), - rel: 'noopener' - }); - } - function installButtonLabel() { return t(!dup ? 'installButton' : versionTest > 0 ? 'installButtonUpdate' : 'installButtonReinstall'); diff --git a/edit/lint.js b/edit/lint.js index f5465e49..7a0893df 100644 --- a/edit/lint.js +++ b/edit/lint.js @@ -1,6 +1,7 @@ /* global CodeMirror messageBox */ /* global editors makeSectionVisible showCodeMirrorPopup showHelp */ /* global loadScript require CSSLint stylelint */ +/* global makeLink */ 'use strict'; onDOMready().then(loadLinterAssets); @@ -357,12 +358,6 @@ function toggleLintReport() { } function showLintHelp() { - const makeLink = (href, textContent) => $element({ - tag: 'a', - target: '_blank', - href, - textContent, - }); const linter = prefs.get('editor.linter'); const baseUrl = linter === 'stylelint' ? 'https://stylelint.io/user-guide/rules/' diff --git a/js/dom.js b/js/dom.js index 20d3a749..d72d68cd 100644 --- a/js/dom.js +++ b/js/dom.js @@ -183,3 +183,13 @@ function $element(opt) { } return element; } + + +function makeLink(href = '', textContent) { + return $element({ + tag: 'a', + target: '_blank', + href, + textContent, + }); +}