From 9e16354310b51a06f794bbbee3ca27f7ad7f23ae Mon Sep 17 00:00:00 2001 From: Maki Nishifuji Date: Sat, 25 Feb 2017 02:02:38 +0900 Subject: [PATCH] fix codacy issue --- packages/rocketchat-markdown/markdown.js | 10 +++++----- .../parser/original/code.js | 5 +++-- packages/rocketchat-markdown/settings.js | 18 +++++++++--------- .../jasmine/client/unit/markdown.spec.coffee | 2 +- .../client/page/snippetPage.js | 4 ++-- .../rocketchat-theme/client/imports/base.less | 12 +++++++----- .../message/message.coffee | 2 +- .../message/messageBox.coffee | 8 ++++---- 8 files changed, 32 insertions(+), 29 deletions(-) diff --git a/packages/rocketchat-markdown/markdown.js b/packages/rocketchat-markdown/markdown.js index 3c18cbfd360..532b1cd4159 100644 --- a/packages/rocketchat-markdown/markdown.js +++ b/packages/rocketchat-markdown/markdown.js @@ -11,10 +11,10 @@ import { original } from './parser/original/original.js'; const parsers = { original, - marked, + marked }; -const Markdown = (message) => { +const markdown = (message) => { const parser = RocketChat.settings.get('Markdown_Parser'); if (typeof parsers[parser] === 'function') { return parsers[parser](message); @@ -22,11 +22,11 @@ const Markdown = (message) => { return parsers['original'](message); }; -RocketChat.Markdown = Markdown; -RocketChat.callbacks.add('renderMessage', Markdown, RocketChat.callbacks.priority.HIGH, 'markdown'); +RocketChat.markdown = markdown; +RocketChat.callbacks.add('renderMessage', markdown, RocketChat.callbacks.priority.HIGH, 'markdown'); if (Meteor.isClient) { Blaze.registerHelper('RocketChatMarkdown', (text) => { - return RocketChat.Markdown(text); + return RocketChat.markdown(text); }); } diff --git a/packages/rocketchat-markdown/parser/original/code.js b/packages/rocketchat-markdown/parser/original/code.js index 5c1888f0527..36a6a5c2ffb 100644 --- a/packages/rocketchat-markdown/parser/original/code.js +++ b/packages/rocketchat-markdown/parser/original/code.js @@ -27,8 +27,8 @@ const blockCode = (message) => { } if (count % 2 > 0) { - message.html = message.html + "\n```"; - message.msg = message.msg + "\n```"; + message.html = message.html + '\n```'; + message.msg = message.msg + '\n```'; } let msgParts = message.html.replace(/
/gm, '\n').split(/^\s*(```(?:[a-zA-Z]+)?(?:(?:.|\n)*?)```)(?:\n)?$/gm); @@ -48,6 +48,7 @@ const blockCode = (message) => { code = _.unescapeHTML(codeMatch[2]); } + let result = null; lang = _.trim(lang); if (hljs.listLanguages().includes(lang)) { result = hljs.highlight(lang, code); diff --git a/packages/rocketchat-markdown/settings.js b/packages/rocketchat-markdown/settings.js index 0d7033691e2..e26cd817898 100644 --- a/packages/rocketchat-markdown/settings.js +++ b/packages/rocketchat-markdown/settings.js @@ -13,7 +13,7 @@ Meteor.startup(function() { }], group: 'Message', section: 'Markdown', - "public": true + 'public': true }); const enableQueryOriginal = {_id: 'Markdown_Parser', value: 'original'}; @@ -21,14 +21,14 @@ Meteor.startup(function() { type: 'boolean', group: 'Message', section: 'Markdown', - "public": true, + 'public': true, enableQuery: enableQueryOriginal }); RocketChat.settings.add('Markdown_SupportSchemesForLink', 'http,https', { type: 'string', group: 'Message', section: 'Markdown', - "public": true, + 'public': true, i18nDescription: 'Markdown_SupportSchemesForLink_Description', enableQuery: enableQueryOriginal }); @@ -38,28 +38,28 @@ Meteor.startup(function() { type: 'boolean', group: 'Message', section: 'Markdown', - "public": true, + 'public': true, enableQuery: enableQueryMarked }); RocketChat.settings.add('Markdown_Marked_Tables', true, { type: 'boolean', group: 'Message', section: 'Markdown', - "public": true, + 'public': true, enableQuery: enableQueryMarked }); RocketChat.settings.add('Markdown_Marked_Breaks', true, { type: 'boolean', group: 'Message', section: 'Markdown', - "public": true, + 'public': true, enableQuery: enableQueryMarked }); RocketChat.settings.add('Markdown_Marked_Pedantic', false, { type: 'boolean', group: 'Message', section: 'Markdown', - "public": true, + 'public': true, enableQuery: [{ _id: 'Markdown_Parser', value: 'marked' @@ -72,14 +72,14 @@ Meteor.startup(function() { type: 'boolean', group: 'Message', section: 'Markdown', - "public": true, + 'public': true, enableQuery: enableQueryMarked }); RocketChat.settings.add('Markdown_Marked_Smartypants', true, { type: 'boolean', group: 'Message', section: 'Markdown', - "public": true, + 'public': true, enableQuery: enableQueryMarked }); }); diff --git a/packages/rocketchat-markdown/tests/jasmine/client/unit/markdown.spec.coffee b/packages/rocketchat-markdown/tests/jasmine/client/unit/markdown.spec.coffee index f154266a873..2099aee0106 100644 --- a/packages/rocketchat-markdown/tests/jasmine/client/unit/markdown.spec.coffee +++ b/packages/rocketchat-markdown/tests/jasmine/client/unit/markdown.spec.coffee @@ -1,4 +1,4 @@ describe 'rocketchat:markdown Client', -> it 'should exist', -> - expect(RocketChat.Markdown).toBeDefined() + expect(RocketChat.markdown).toBeDefined() diff --git a/packages/rocketchat-message-snippet/client/page/snippetPage.js b/packages/rocketchat-message-snippet/client/page/snippetPage.js index 17d4e319911..c3edada279e 100644 --- a/packages/rocketchat-message-snippet/client/page/snippetPage.js +++ b/packages/rocketchat-message-snippet/client/page/snippetPage.js @@ -11,8 +11,8 @@ Template.snippetPage.helpers({ return null; } message.html = message.msg; - const markdownCode = new RocketChat.MarkdownCode(message); - return markdownCode.tokens[0].text; + const markdown = RocketChat.markdown(message); + return markdown.tokens[0].text; }, date() { const snippet = SnippetedMessages.findOne({ _id: FlowRouter.getParam('snippetId') }); diff --git a/packages/rocketchat-theme/client/imports/base.less b/packages/rocketchat-theme/client/imports/base.less index 5326c35f3fe..bc2d8f2dc25 100644 --- a/packages/rocketchat-theme/client/imports/base.less +++ b/packages/rocketchat-theme/client/imports/base.less @@ -2952,7 +2952,8 @@ label.required::after { line-height: 1em; } - ul, ol { + ul, + ol { padding: 0 0 0 24px; } @@ -2974,16 +2975,17 @@ label.required::after { overflow: auto; tr { - background-color: #fff; - border-top: 1px solid #ccc; + background-color: #ffffff; + border-top: 1px solid #cccccc; th { font-weight: 600; } - th, td { + th, + td { padding: 6px 13px; - border: 1px solid #ddd; + border: 1px solid #dddddd; } } } diff --git a/packages/rocketchat-ui-message/message/message.coffee b/packages/rocketchat-ui-message/message/message.coffee index aba1128035c..58d2723367c 100644 --- a/packages/rocketchat-ui-message/message/message.coffee +++ b/packages/rocketchat-ui-message/message/message.coffee @@ -177,7 +177,7 @@ Template.message.onCreated -> msg = renderMessageBody msg if isSystemMessage - return RocketChat.Markdown msg + return RocketChat.markdown msg else return msg diff --git a/packages/rocketchat-ui-message/message/messageBox.coffee b/packages/rocketchat-ui-message/message/messageBox.coffee index 1967246ccbf..b7cbc8ad238 100644 --- a/packages/rocketchat-ui-message/message/messageBox.coffee +++ b/packages/rocketchat-ui-message/message/messageBox.coffee @@ -18,17 +18,17 @@ Template.messageBox.helpers else return roomData.name showMarkdown: -> - return RocketChat.Markdown + return RocketChat.markdown markdownParserOriginal: -> - return RocketChat.Markdown && 'original' == RocketChat.settings.get('Markdown_Parser') + return RocketChat.markdown && 'original' == RocketChat.settings.get('Markdown_Parser') markdownParserMarked: -> - return RocketChat.Markdown && 'marked' == RocketChat.settings.get('Markdown_Parser') + return RocketChat.markdown && 'marked' == RocketChat.settings.get('Markdown_Parser') showKatex: -> return RocketChat.katex katexSyntax: -> return katexSyntax() showFormattingTips: -> - return RocketChat.settings.get('Message_ShowFormattingTips') and (RocketChat.Markdown or RocketChat.MarkdownCode or katexSyntax()) + return RocketChat.settings.get('Message_ShowFormattingTips') and (RocketChat.markdown or katexSyntax()) canJoin: -> return RocketChat.roomTypes.verifyShowJoinLink @_id joinCodeRequired: ->