From caa695cfbd918af3dc9ef8007e2a7d5e37737250 Mon Sep 17 00:00:00 2001 From: Diego Sampaio <chinello@gmail.com> Date: Thu, 16 Jun 2016 16:01:00 -0300 Subject: [PATCH] Fix eslint errors --- .eslintignore | 2 ++ packages/rocketchat-action-links/package.js | 2 +- .../rocketchat-livechat/server/forwardUnclosedLivechats.js | 2 +- packages/rocketchat-markdown/package.js | 4 ++-- packages/rocketchat-slackbridge/slackbridge.js | 4 +--- packages/rocketchat-videobridge/client/actionLink.js | 6 +----- packages/rocketchat-videobridge/client/tabBar.js | 3 --- .../rocketchat-videobridge/client/views/videoFlexTab.js | 1 + packages/rocketchat-videobridge/package.js | 3 +-- packages/rocketchat-videobridge/server/actionLink.js | 2 +- 10 files changed, 11 insertions(+), 18 deletions(-) diff --git a/.eslintignore b/.eslintignore index bb44602df11..efbc1fd9a9f 100644 --- a/.eslintignore +++ b/.eslintignore @@ -21,3 +21,5 @@ packages/rocketchat-livechat/client/lib/ua-parser.js packages/rocketchat-livechat/public/livechat.js packages/rocketchat-livechat/public/external.js packages/rocketchat-autolinker/lib/Autolinker.min.js +packages/rocketchat-livechat/lib/ua-parser.js +packages/rocketchat-videobridge/client/public/external_api.js diff --git a/packages/rocketchat-action-links/package.js b/packages/rocketchat-action-links/package.js index bdabfbb53cb..a9c6a4b1e51 100644 --- a/packages/rocketchat-action-links/package.js +++ b/packages/rocketchat-action-links/package.js @@ -2,7 +2,7 @@ Package.describe({ name: 'rocketchat:action-links', version: '0.0.1', summary: 'Add custom actions that call functions', - git: '', + git: '' }); Package.onUse(function(api) { diff --git a/packages/rocketchat-livechat/server/forwardUnclosedLivechats.js b/packages/rocketchat-livechat/server/forwardUnclosedLivechats.js index ef4efdc8791..d697c04716b 100644 --- a/packages/rocketchat-livechat/server/forwardUnclosedLivechats.js +++ b/packages/rocketchat-livechat/server/forwardUnclosedLivechats.js @@ -4,7 +4,7 @@ let agentsHandler; let monitorAgents = false; let forwardChatTimeout = 60000; -RocketChat.onlineAgents = onlineAgents = { +let onlineAgents = { users: {}, queue: {}, diff --git a/packages/rocketchat-markdown/package.js b/packages/rocketchat-markdown/package.js index 64e3d89012f..709d117a666 100644 --- a/packages/rocketchat-markdown/package.js +++ b/packages/rocketchat-markdown/package.js @@ -14,7 +14,7 @@ Package.onUse(function(api) { 'templating', 'underscorestring:underscore.string', 'simple:highlight.js', - 'rocketchat:lib', + 'rocketchat:lib' ]); api.addFiles('settings.coffee', 'server'); @@ -27,7 +27,7 @@ Package.onTest(function(api) { 'coffeescript', 'sanjo:jasmine@0.20.2', 'rocketchat:lib', - 'rocketchat:markdown', + 'rocketchat:markdown' ]); api.addFiles('tests/jasmine/client/unit/markdown.spec.coffee', 'client'); diff --git a/packages/rocketchat-slackbridge/slackbridge.js b/packages/rocketchat-slackbridge/slackbridge.js index 9363906bdb9..d0aee870c28 100644 --- a/packages/rocketchat-slackbridge/slackbridge.js +++ b/packages/rocketchat-slackbridge/slackbridge.js @@ -323,12 +323,10 @@ class SlackBridge { Meteor.runAsUser(user._id, () => { Meteor.call('pinMessage', msgObj); }); - return; } else { logger.events.error('Pinned item with no attachment'); - return; } - break; + return; case 'unpinned_item': logger.events.error('Unpinned item not implemented'); return; diff --git a/packages/rocketchat-videobridge/client/actionLink.js b/packages/rocketchat-videobridge/client/actionLink.js index aa8b4717ded..91e4c655f9b 100644 --- a/packages/rocketchat-videobridge/client/actionLink.js +++ b/packages/rocketchat-videobridge/client/actionLink.js @@ -1,4 +1,4 @@ -RocketChat.actionLinks.register('joinJitsiCall', function(message, params) { +RocketChat.actionLinks.register('joinJitsiCall', function(/*message, params*/) { if (Session.get('openedRoom')) { let rid = Session.get('openedRoom'); @@ -16,9 +16,5 @@ RocketChat.actionLinks.register('joinJitsiCall', function(message, params) { } else { toastr.info(TAPi18n.__('Call Already Ended', '')); } - } - - - }); diff --git a/packages/rocketchat-videobridge/client/tabBar.js b/packages/rocketchat-videobridge/client/tabBar.js index 935cf341696..d2b682ef37d 100644 --- a/packages/rocketchat-videobridge/client/tabBar.js +++ b/packages/rocketchat-videobridge/client/tabBar.js @@ -4,9 +4,6 @@ Meteor.startup(function() { // Load from the jitsi meet instance. if (typeof JitsiMeetExternalAPI !== undefined) { - let domain = RocketChat.settings.get('Jitsi_Domain'); - let ssl = RocketChat.settings.get('Jitsi_SSL'); - $.getScript('/packages/rocketchat_videobridge/client/public/external_api.js'); } diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTab.js b/packages/rocketchat-videobridge/client/views/videoFlexTab.js index 9fde2b2bdbd..f0629b66dd0 100644 --- a/packages/rocketchat-videobridge/client/views/videoFlexTab.js +++ b/packages/rocketchat-videobridge/client/views/videoFlexTab.js @@ -1,4 +1,5 @@ /* globals JitsiMeetExternalAPI */ +/* eslint new-cap: [2, {"capIsNewExceptions": ["MD5"]}] */ Template.videoFlexTab.helpers({ diff --git a/packages/rocketchat-videobridge/package.js b/packages/rocketchat-videobridge/package.js index 804cd6672ce..bcd5835356d 100644 --- a/packages/rocketchat-videobridge/package.js +++ b/packages/rocketchat-videobridge/package.js @@ -2,7 +2,7 @@ Package.describe({ name: 'rocketchat:videobridge', version: '0.2.0', summary: 'jitsi integration', - git: '', + git: '' }); Package.onUse(function(api) { @@ -30,5 +30,4 @@ Package.onUse(function(api) { api.addFiles('server/models/Rooms.js', 'server'); api.addFiles('server/methods/jitsiSetTimeout.js', 'server'); api.addFiles('server/actionLink.js', 'server'); - }); diff --git a/packages/rocketchat-videobridge/server/actionLink.js b/packages/rocketchat-videobridge/server/actionLink.js index 33e6dc11904..360542b6821 100644 --- a/packages/rocketchat-videobridge/server/actionLink.js +++ b/packages/rocketchat-videobridge/server/actionLink.js @@ -1,3 +1,3 @@ -RocketChat.actionLinks.register('joinJitsiCall', function(message, params) { +RocketChat.actionLinks.register('joinJitsiCall', function(/*message, params*/) { }); -- GitLab