diff --git a/.eslintignore b/.eslintignore index bb44602df11c8b06580422858972149067f3a4ec..efbc1fd9a9fad182f6591075ce48064fd31bcaae 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 bdabfbb53cbe1fac48835615aa737780ddce60ce..a9c6a4b1e51378cec6166e09f433928ccc932ff5 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 ef4efdc879158f23a7fdb71513926906182bf1db..d697c04716bda0c9a597b1e267344531fcdb1798 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 64e3d89012f91906827ce19a06beee619f57eb52..709d117a666a981257c313a020c7e793250d92ca 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 9363906bdb9f9abc4f6db2e1d05eda21455493eb..d0aee870c2844434d5450e76247905bbaa3582a0 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 aa8b4717ded9620b940bb54405997b1740713c3c..91e4c655f9b7385e4753cf576a3b718e277a8539 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 935cf34169660931be1a8e2668c3fd594ff1c6a0..d2b682ef37db460c093ae03e71c396fa3b12b2dc 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 9fde2b2bdbde933fd917390424b505654c9655f3..f0629b66dd015375e1c130ab32bb9e019f17e924 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 804cd6672ce0f3733031698f50d20118482da20a..bcd5835356dce355f62ca0983d11e2f0c5583359 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 33e6dc1190452824dcb9722413a010a055c52668..360542b68212a4b4ead4c3e792ea86ea5c0f02d8 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*/) { });