Skip to content

Commit

Permalink
Remove /* globals */ wave 3 (#12997)
Browse files Browse the repository at this point in the history
* Remove /* globals */ from files wave 1

* Fix lint

* Remove /* globals */ wave 2

* remove-globals-wave-3
  • Loading branch information
MarcosSpessatto authored and rodrigok committed Dec 19, 2018
1 parent 9e805af commit 3b7de77
Show file tree
Hide file tree
Showing 37 changed files with 35 additions and 48 deletions.
14 changes: 13 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,47 @@
"alerts" : false,
"Apps" : false,
"Assets" : false,
"AudioRecorder" : false,
"CachedChatSubscription" : false,
"ChatMessage" : false,
"ChatMessages" : false,
"chatMessages" : false,
"ChatRoom" : false,
"ChatSubscription" : false,
"cordova" : false,
"device" : false,
"DynamicCss" : false,
"facebookConnectPlugin" : false,
"FileUpload" : false,
"fileUploadHandler" : false,
"fireGlobalEvent" : false,
"handleError" : false,
"getAvatarUrlFromUsername" : false,
"getAvatarSuggestionForUser" : false,
"isChrome" : false,
"isFirefox" : false,
"isRtl" : false,
"jscolor" : false,
"KonchatNotification" : false,
"msgStream" : false,
"MsgTyping" : false,
"modal" : false,
"menu" : false,
"Npm" : false,
"openRoom" : false,
"OnePassword" : false,
"Package" : false,
"popover" : false,
"readMessage" : false,
"RocketChat" : true,
"roomExit" : true,
"RoomHistoryManager" : false,
"RoomManager" : false,
"RoomRoles" : false,
"Servers" : false,
"Settings" : false,
"SideNav" : false,
"t" : false,
"toolbarSearch" : false,
"TwitterConnect" : false,
"UserRoles" : false,
"VideoRecorder" : false,
Expand Down
2 changes: 0 additions & 2 deletions packages/rocketchat-livechat/assets/rocket-livechat.js
Original file line number Diff line number Diff line change
Expand Up @@ -472,8 +472,6 @@
}
}(this || {}));

/* globals EventEmitter */

(function(w) {
w.RocketChat = w.RocketChat || { _: [] };
var config = {};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* globals jscolor */
/* eslint new-cap: ["error", { "newIsCapExceptions": ["jscolor"] }]*/
import { Meteor } from 'meteor/meteor';
import { Mongo } from 'meteor/mongo';
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-message-snippet/package.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* globals Package */
Package.describe({
name: 'rocketchat:message-snippet',
version: '0.0.1',
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-reactions/server/setReaction.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* global msgStream */
import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random';
import { TAPi18n } from 'meteor/tap:i18n';
Expand Down
3 changes: 2 additions & 1 deletion packages/rocketchat-search/client/search/search.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* globals ReactiveVar, TAPi18n */
import { Meteor } from 'meteor/meteor';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
import { ReactiveVar } from 'meteor/reactive-var';
import { TAPi18n } from 'meteor/tap:i18n';
import toastr from 'toastr';
import _ from 'underscore';

Expand Down
3 changes: 1 addition & 2 deletions packages/rocketchat-search/server/service/providerService.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* globals RocketChat */
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';
import _ from 'underscore';

import { validationService } from '../service/validationService';
import SearchLogger from '../logger/logger';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* globals msgStream */
import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';
import { Random } from 'meteor/random';
Expand Down
3 changes: 2 additions & 1 deletion packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Template } from 'meteor/templating';
import { AutoComplete } from 'meteor/mizzao:autocomplete';
import { RocketChat } from 'meteor/rocketchat:lib';
import { t } from 'meteor/rocketchat:ui';
import { Deps } from 'meteor/deps';
import toastr from 'toastr';

const acEvents = {
Expand Down Expand Up @@ -124,7 +125,7 @@ Template.inviteUsers.onRendered(function() {
users.set(usersArr);
});
});
/* global Deps */

Template.inviteUsers.onCreated(function() {
this.selectedUsers = new ReactiveVar([]);
const filter = { exceptions :[Meteor.user().username].concat(this.selectedUsers.get().map((u) => u.username)) };
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-ui-login/client/login/form.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* globals OnePassword, device */
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Tracker } from 'meteor/tracker';
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-ui-master/client/main.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* globals toolbarSearch, menu, fireGlobalEvent, CachedChatSubscription, DynamicCss, popover */
import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';
import { ReactiveVar } from 'meteor/reactive-var';
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-master/server/inject.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* globals Inject */
import { Meteor } from 'meteor/meteor';
import { Inject } from 'meteor/meteorhacks:inject-initial';
import _ from 'underscore';
import s from 'underscore.string';

Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-message/client/message.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { DateFormat } from 'meteor/rocketchat:lib';
import { renderEmoji } from 'meteor/rocketchat:emoji';
import { renderMessageBody } from './renderMessageBody';
import { RocketChat } from 'meteor/rocketchat:lib';
import { RoomRoles, UserRoles } from 'meteor/rocketchat:ui';
import { t } from 'meteor/rocketchat:ui';

async function renderPdfToCanvas(canvasId, pdfLink) {
Expand Down Expand Up @@ -92,7 +93,6 @@ Template.message.helpers({
if (!this.u || !this.u._id) {
return [];
}
/* globals UserRoles RoomRoles */
const userRoles = UserRoles.findOne(this.u._id);
const roomRoles = RoomRoles.findOne({
'u._id': this.u._id,
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-ui-message/client/messageBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ Template.messageBox.helpers({
},
};
},
/* globals MsgTyping*/
usersTyping() {
const maxUsernames = 4;
const users = MsgTyping.get(this._id);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* globals toolbarSearch */
// This is not supposed to be a complete list
// it is just to improve readability in this file

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* global toolbarSearch */
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Session } from 'meteor/session';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* globals device */
import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random';
import mime from 'mime-type/with-db';
Expand Down
3 changes: 1 addition & 2 deletions packages/rocketchat-ui-sidenav/client/roomList.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* globals RocketChat */
import { Meteor } from 'meteor/meteor';
import { UiTextContext } from 'meteor/rocketchat:lib';
import { RocketChat, UiTextContext } from 'meteor/rocketchat:lib';
import { Template } from 'meteor/templating';

Template.roomList.helpers({
Expand Down
2 changes: 0 additions & 2 deletions packages/rocketchat-ui-sidenav/client/sideNav.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { lazyloadtick } from 'meteor/rocketchat:lazy-load';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';

/* globals menu*/

Template.sideNav.helpers({
flexTemplate() {
return SideNav.getFlex().template;
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-sidenav/client/sidebarHeader.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* globals popover menu */
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';
import { popover } from 'meteor/rocketchat:ui';

const setStatus = (status) => {
AccountBox.setStatus(status);
Expand Down
3 changes: 1 addition & 2 deletions packages/rocketchat-ui-sidenav/client/sidebarItem.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/* globals menu popover */
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
import moment from 'moment';
import { renderMessageBody } from 'meteor/rocketchat:ui-message';

import { popover } from 'meteor/rocketchat:ui';

Template.sidebarItem.helpers({
or(...args) {
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-sidenav/client/sortlist.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* globals popover */
import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { popover } from 'meteor/rocketchat:ui';

const checked = function(prop, field) {
const userId = Meteor.userId();
Expand Down
2 changes: 0 additions & 2 deletions packages/rocketchat-ui-sidenav/client/toolbar.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* global menu, toolbarSearch */

import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { ReactiveVar } from 'meteor/reactive-var';
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-ui/client/components/header/header.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* globals fireGlobalEvent*/
import { Meteor } from 'meteor/meteor';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-ui/client/components/icon.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* globals isFirefox, isChrome */
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';

Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui/client/lib/avatar.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Session } from 'meteor/session';

Blaze.registerHelper('avatarUrlFromUsername', getAvatarUrlFromUsername);

this.getAvatarAsPng = function(username, cb) {
export const getAvatarAsPng = function(username, cb) {
const image = new Image;
image.src = getAvatarUrlFromUsername(username);
image.onload = function() {
Expand Down
2 changes: 0 additions & 2 deletions packages/rocketchat-ui/client/lib/chatMessages.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* globals MsgTyping */
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Random } from 'meteor/random';
Expand Down Expand Up @@ -195,7 +194,6 @@ ChatMessages = class ChatMessages { //eslint-disable-line
this.editing.saved = this.input.value;
return this.editing.savedCursor = this.input.selectionEnd;
}
/* globals readMessage KonchatNotification */
/**
* * @param {string} rim room ID
* * @param {Element} input DOM element
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* global CodeMirrors */
CodeMirrors = {};
const CodeMirrors = {};

import { Meteor } from 'meteor/meteor';
import { Session } from 'meteor/session';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* globals facebookConnectPlugin Facebook*/
import { Meteor } from 'meteor/meteor';
import { Accounts } from 'meteor/accounts-base';
import { Facebook } from 'meteor/facebook-oauth';

Meteor.loginWithFacebookCordova = function(options, callback) {
if (!callback && typeof options === 'function') {
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-ui/client/lib/cordova/keyboard-fix.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* globals device cordova*/
import { Meteor } from 'meteor/meteor';

if (Meteor.isCordova) {
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui/client/lib/cordova/push.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* globals Push Servers*/
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Push } from 'meteor/rocketchat:push';

if (Meteor.isCordova) {
// Push.addListener 'token', (token) ->
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui/client/lib/cordova/user-state.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* globals UserPresence, readMessage */
import { Meteor } from 'meteor/meteor';
import { UserPresence } from 'meteor/konecty:user-presence';
import _ from 'underscore';

let timer = undefined;
Expand Down
5 changes: 2 additions & 3 deletions packages/rocketchat-ui/client/lib/fileUpload.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
/* globals Handlebars, fileUpload, modal, t */
/* exported fileUpload */
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { Session } from 'meteor/session';
import s from 'underscore.string';
import { fileUploadHandler } from 'meteor/rocketchat:file-upload';
import { Handlebars } from 'meteor/ui';

const readAsDataURL = (file, callback) => {
const reader = new FileReader();
Expand Down Expand Up @@ -135,7 +134,7 @@ const getUploadPreview = async(file, preview) => {
return getGenericUploadPreview(file, preview);
};

fileUpload = async(files) => {
fileUpload = async(files) => { //eslint-disable-line
files = [].concat(files);

const roomId = Session.get('openedRoom');
Expand Down
1 change: 0 additions & 1 deletion packages/rocketchat-ui/client/lib/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ window.addEventListener('resize', _.debounce((() => {
};
})(), 100));

/* globals isRtl */
this.menu = new class extends EventEmitter {
constructor() {
super();
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui/client/lib/notification.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Session } from 'meteor/session';
import _ from 'underscore';
import s from 'underscore.string';
import { e2e } from 'meteor/rocketchat:e2e';
import { getAvatarAsPng } from './avatar';

KonchatNotification = { //eslint-disable-line
notificationStatus: new ReactiveVar,
Expand Down Expand Up @@ -85,7 +86,6 @@ KonchatNotification = { //eslint-disable-line
}
}

/* globals getAvatarAsPng*/
return getAvatarAsPng(notification.payload.sender.username, function(avatarAsPng) {
notification.icon = avatarAsPng;
return KonchatNotification.notify(notification); //eslint-disable-line
Expand Down
5 changes: 2 additions & 3 deletions packages/rocketchat-ui/client/lib/recorderjs/audioRecorder.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* globals Recorder */
// TODO: embed Recorder class here
// TODO: create the worker for mp3 encoding on-the-fly
AudioRecorder = new (class AudioRecorder {
AudioRecorder = new (class AudioRecorder { //eslint-disable-line
start(cb) {
window.audioContext = new (window.AudioContext || window.webkitAudioContext);

Expand Down Expand Up @@ -33,7 +32,7 @@ AudioRecorder = new (class AudioRecorder {
startUserMedia(stream) {
this.stream = stream;
const input = window.audioContext.createMediaStreamSource(stream);
this.recorder = new Recorder(input, {
this.recorder = new window.Recorder(input, {
workerPath: 'mp3-realtime-worker.js',
numChannels: 1,
});
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-ui/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Package.onUse(function(api) {
'rocketchat:e2e',
'mizzao:autocomplete',
'rocketchat:file-upload',
'konecty:user-presence',
]);

api.use('kadira:flow-router', 'client');
Expand Down

0 comments on commit 3b7de77

Please sign in to comment.