From 6cc88e0519188bed982ec962a39637bfae8f4fe4 Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Fri, 12 May 2017 14:49:36 -0300 Subject: [PATCH] fix conflicts and remove returns --- packages/rocketchat-ui-admin/client/admin.js | 102 ++++++++---------- .../rocketchat-ui-admin/client/adminFlex.js | 16 +-- .../client/adminInfo.coffee | 73 ------------- .../rocketchat-ui-admin/client/adminInfo.js | 19 +++- .../client/rooms/adminRoomInfo.js | 47 ++++---- .../client/rooms/adminRooms.js | 41 +++---- .../client/users/adminInviteUser.js | 12 +-- .../client/users/adminUsers.js | 26 ++--- packages/rocketchat-ui-admin/package.js | 2 - 9 files changed, 116 insertions(+), 222 deletions(-) delete mode 100644 packages/rocketchat-ui-admin/client/adminInfo.coffee diff --git a/packages/rocketchat-ui-admin/client/admin.js b/packages/rocketchat-ui-admin/client/admin.js index 4db80569113..da808398c5d 100644 --- a/packages/rocketchat-ui-admin/client/admin.js +++ b/packages/rocketchat-ui-admin/client/admin.js @@ -14,18 +14,20 @@ const setFieldValue = function(settingId, value, type, editor) { const input = $('.page-settings').find(`[name="${ settingId }"]`); switch (type) { case 'boolean': - return $('.page-settings').find(`[name="${ settingId }"][value="${ Number(value) }"]`).prop('checked', true).change(); + $('.page-settings').find(`[name="${ settingId }"][value="${ Number(value) }"]`).prop('checked', true).change(); + break; case 'code': - return input.next()[0].CodeMirror.setValue(value); + input.next()[0].CodeMirror.setValue(value); + break; case 'color': input.parents('.horizontal').find('select[name="color-editor"]').val(editor).change(); input.val(value).change(); if (editor === 'color') { - return new jscolor(input); //eslint-disable-line + new jscolor(input); //eslint-disable-line } break; default: - return input.val(value).change(); + input.val(value).change(); } }; @@ -39,14 +41,14 @@ Template.admin.onCreated(function() { RocketChat.settings.cachedCollectionPrivate.init(); } this.selectedRooms = new ReactiveVar({}); - return RocketChat.settings.collectionPrivate.find().observe({ + RocketChat.settings.collectionPrivate.find().observe({ added: (data) => { const selectedRooms = this.selectedRooms.get(); if (data.type === 'roomPick') { selectedRooms[data._id] = data.value; this.selectedRooms.set(selectedRooms); } - return TempSettings.insert(data); + TempSettings.insert(data); }, changed: (data) => { const selectedRooms = this.selectedRooms.get(); @@ -54,7 +56,7 @@ Template.admin.onCreated(function() { selectedRooms[data._id] = data.value; this.selectedRooms.set(selectedRooms); } - return TempSettings.update(data._id, data); + TempSettings.update(data._id, data); }, removed: (data) => { const selectedRooms = this.selectedRooms.get(); @@ -62,13 +64,13 @@ Template.admin.onCreated(function() { delete selectedRooms[data._id]; this.selectedRooms.set(selectedRooms); } - return TempSettings.remove(data._id); + TempSettings.remove(data._id); } }); }); Template.admin.onDestroyed(function() { - return TempSettings.remove({}); + TempSettings.remove({}); }); Template.admin.helpers({ @@ -277,18 +279,11 @@ Template.admin.helpers({ } const onChange = function() { const value = codeMirror.getValue(); - return TempSettings.update({ - _id - }, { - $set: { - value, - changed: RocketChat.settings.collectionPrivate.findOne(_id).value !== value - } - }); + TempSettings.update({ _id }, { $set: { value, changed: RocketChat.settings.collectionPrivate.findOne(_id).value !== value }}); }; const onChangeDelayed = _.debounce(onChange, 500); codeMirror.on('change', onChangeDelayed); - return codeMirror.changeAdded = true; + codeMirror.changeAdded = true; }); }, assetAccept(fileConstraints) { @@ -341,7 +336,7 @@ Template.admin.events({ case 'boolean': value = value === '1'; } - return TempSettings.update({ + TempSettings.update({ _id: this._id }, { $set: { @@ -352,7 +347,7 @@ Template.admin.events({ }, 500), 'change select[name=color-editor]'(e) { const value = _.trim($(e.target).val()); - return TempSettings.update({ _id: this._id }, { $set: { editor: value }}); + TempSettings.update({ _id: this._id }, { $set: { editor: value }}); }, 'click .submit .discard'() { const group = FlowRouter.getParam('group'); @@ -362,9 +357,9 @@ Template.admin.events({ }; const settings = TempSettings.find(query, { fields: { _id: 1, value: 1, packageValue: 1 }}).fetch(); - return settings.forEach(function(setting) { + settings.forEach(function(setting) { const oldSetting = RocketChat.settings.collectionPrivate.findOne({ _id: setting._id }, { fields: { value: 1, type: 1, editor: 1 }}); - return setFieldValue(setting._id, oldSetting.value, oldSetting.type, oldSetting.editor); + setFieldValue(setting._id, oldSetting.value, oldSetting.type, oldSetting.editor); }); }, 'click .reset-setting'(e) { @@ -374,7 +369,7 @@ Template.admin.events({ settingId = $(e.target).parent().data('setting'); } const defaultValue = getDefaultSetting(settingId); - return setFieldValue(settingId, defaultValue.packageValue, defaultValue.type, defaultValue.editor); + setFieldValue(settingId, defaultValue.packageValue, defaultValue.type, defaultValue.editor); }, 'click .reset-group'(e) { let settings; @@ -386,10 +381,10 @@ Template.admin.events({ } else { settings = TempSettings.find({ group, section }, { fields: { _id: 1 }}).fetch(); } - return settings.forEach(function(setting) { + settings.forEach(function(setting) { const defaultValue = getDefaultSetting(setting._id); setFieldValue(setting._id, defaultValue.packageValue, defaultValue.type, defaultValue.editor); - return TempSettings.update({_id: setting._id }, { + TempSettings.update({_id: setting._id }, { $set: { value: defaultValue.packageValue, changed: RocketChat.settings.collectionPrivate.findOne(setting._id).value !== defaultValue.packageValue @@ -402,18 +397,18 @@ Template.admin.events({ const query = { group, changed: true }; const settings = TempSettings.find(query, { fields: { _id: 1, value: 1, editor: 1 }}).fetch(); if (!_.isEmpty(settings)) { - return RocketChat.settings.batchSet(settings, function(err) { + RocketChat.settings.batchSet(settings, function(err) { if (err) { return handleError(err); } TempSettings.update({ changed: true }, { $unset: { changed: 1 }}); - return toastr.success(TAPi18n.__('Settings_updated')); + toastr.success(TAPi18n.__('Settings_updated')); }); } }, 'click .submit .refresh-clients'() { - return Meteor.call('refreshClients', function() { - return toastr.success(TAPi18n.__('Clients_will_refresh_in_a_few_seconds')); + Meteor.call('refreshClients', function() { + toastr.success(TAPi18n.__('Clients_will_refresh_in_a_few_seconds')); }); }, 'click .submit .add-custom-oauth'() { @@ -425,7 +420,7 @@ Template.admin.events({ closeOnConfirm: true, inputPlaceholder: TAPi18n.__('Custom_oauth_unique_name') }; - return swal(config, function(inputValue) { + swal(config, function(inputValue) { if (inputValue === false) { return false; } @@ -433,9 +428,9 @@ Template.admin.events({ swal.showInputError(TAPi18n.__('Name_cant_be_empty')); return false; } - return Meteor.call('addOAuthService', inputValue, function(err) { + Meteor.call('addOAuthService', inputValue, function(err) { if (err) { - return handleError(err); + handleError(err); } }); }); @@ -461,12 +456,12 @@ Template.admin.events({ cancelButtonText: TAPi18n.__('Cancel'), closeOnConfirm: true }; - return swal(config, function() { - return Meteor.call('removeOAuthService', name); + swal(config, function() { + Meteor.call('removeOAuthService', name); }); }, 'click .delete-asset'() { - return Meteor.call('unsetAsset', this.asset); + Meteor.call('unsetAsset', this.asset); }, 'change input[type=file]'(ev) { const e = ev.originalEvent || ev; @@ -499,19 +494,19 @@ Template.admin.events({ 'click .expand'(e) { $(e.currentTarget).closest('.section').removeClass('section-collapsed'); $(e.currentTarget).closest('button').removeClass('expand').addClass('collapse').find('span').text(TAPi18n.__('Collapse')); - return $('.CodeMirror').each(function(index, codeMirror) { - return codeMirror.CodeMirror.refresh(); + $('.CodeMirror').each(function(index, codeMirror) { + codeMirror.CodeMirror.refresh(); }); }, 'click .collapse'(e) { $(e.currentTarget).closest('.section').addClass('section-collapsed'); - return $(e.currentTarget).closest('button').addClass('expand').removeClass('collapse').find('span').text(TAPi18n.__('Expand')); + $(e.currentTarget).closest('button').addClass('expand').removeClass('collapse').find('span').text(TAPi18n.__('Expand')); }, 'click button.action'() { if (this.type !== 'action') { return; } - return Meteor.call(this.value, function(err, data) { + Meteor.call(this.value, function(err, data) { if (err != null) { err.details = _.extend(err.details || {}, { errorTitle: 'Error' @@ -520,43 +515,38 @@ Template.admin.events({ return; } const args = [data.message].concat(data.params); - return toastr.success(TAPi18n.__.apply(TAPi18n, args), TAPi18n.__('Success')); + toastr.success(TAPi18n.__.apply(TAPi18n, args), TAPi18n.__('Success')); }); }, 'click .button-fullscreen'() { const codeMirrorBox = $(`.code-mirror-box[data-editor-id="${ this._id }"]`); codeMirrorBox.addClass('code-mirror-box-fullscreen content-background-color'); - return codeMirrorBox.find('.CodeMirror')[0].CodeMirror.refresh(); + codeMirrorBox.find('.CodeMirror')[0].CodeMirror.refresh(); }, 'click .button-restore'() { const codeMirrorBox = $(`.code-mirror-box[data-editor-id="${ this._id }"]`); codeMirrorBox.removeClass('code-mirror-box-fullscreen content-background-color'); - return codeMirrorBox.find('.CodeMirror')[0].CodeMirror.refresh(); + codeMirrorBox.find('.CodeMirror')[0].CodeMirror.refresh(); }, 'autocompleteselect .autocomplete'(event, instance, doc) { const selectedRooms = instance.selectedRooms.get(); selectedRooms[this.id] = (selectedRooms[this.id] || []).concat(doc); instance.selectedRooms.set(selectedRooms); const value = selectedRooms[this.id]; - TempSettings.update({ _id: this.id }, { - $set: { - value, - changed: RocketChat.settings.collectionPrivate.findOne(this.id).value !== value - } - }); + TempSettings.update({ _id: this.id }, { $set: { value, changed: RocketChat.settings.collectionPrivate.findOne(this.id).value !== value }}); event.currentTarget.value = ''; - return event.currentTarget.focus(); + event.currentTarget.focus(); }, 'click .remove-room'(event, instance) { const docId = this._id; const settingId = event.currentTarget.getAttribute('data-setting'); const selectedRooms = instance.selectedRooms.get(); selectedRooms[settingId] = _.reject(selectedRooms[settingId] || [], function(setting) { - return setting._id === docId; + setting._id === docId; }); instance.selectedRooms.set(selectedRooms); const value = selectedRooms[settingId]; - return TempSettings.update({ _id: settingId }, { + TempSettings.update({ _id: settingId }, { $set: { value, changed: RocketChat.settings.collectionPrivate.findOne(settingId).value !== value @@ -568,17 +558,17 @@ Template.admin.events({ Template.admin.onRendered(function() { Tracker.afterFlush(function() { SideNav.setFlex('adminFlex'); - return SideNav.openFlex(); + SideNav.openFlex(); }); - return Tracker.autorun(function() { + Tracker.autorun(function() { const hasColor = TempSettings.findOne({ group: FlowRouter.getParam('group'), type: 'color' }, { fields: { _id: 1 }}); if (hasColor) { - return Meteor.setTimeout(function() { - return $('.colorpicker-input').each(function(index, el) { - return new jscolor(el); //eslint-disable-line + Meteor.setTimeout(function() { + $('.colorpicker-input').each(function(index, el) { + new jscolor(el); //eslint-disable-line }); }, 400); } diff --git a/packages/rocketchat-ui-admin/client/adminFlex.js b/packages/rocketchat-ui-admin/client/adminFlex.js index 874385114fe..ce1d6bce5b7 100644 --- a/packages/rocketchat-ui-admin/client/adminFlex.js +++ b/packages/rocketchat-ui-admin/client/adminFlex.js @@ -7,7 +7,7 @@ Template.adminFlex.onCreated(function() { eventType: 'onLogged' }); RocketChat.settings.collectionPrivate = RocketChat.settings.cachedCollectionPrivate.collection; - return RocketChat.settings.cachedCollectionPrivate.init(); + RocketChat.settings.cachedCollectionPrivate.init(); } }); @@ -27,7 +27,7 @@ Template.adminFlex.helpers({ let groups = []; records.forEach(function(record) { if (filterRegex.test(TAPi18n.__(record.i18nLabel || record._id))) { - return groups.push(record.group || record._id); + groups.push(record.group || record._id); } }); groups = _.unique(groups); @@ -56,21 +56,21 @@ Template.adminFlex.helpers({ Template.adminFlex.events({ 'mouseenter header'() { - return SideNav.overArrow(); + SideNav.overArrow(); }, 'mouseleave header'() { - return SideNav.leaveArrow(); + SideNav.leaveArrow(); }, 'click header'() { - return SideNav.closeFlex(); + SideNav.closeFlex(); }, 'click .cancel-settings'() { - return SideNav.closeFlex(); + SideNav.closeFlex(); }, 'click .admin-link'() { - return menu.close(); + menu.close(); }, 'keyup [name=settings-search]'(e, t) { - return t.settingsFilter.set(e.target.value); + t.settingsFilter.set(e.target.value); } }); diff --git a/packages/rocketchat-ui-admin/client/adminInfo.coffee b/packages/rocketchat-ui-admin/client/adminInfo.coffee deleted file mode 100644 index 1bfaedf4c89..00000000000 --- a/packages/rocketchat-ui-admin/client/adminInfo.coffee +++ /dev/null @@ -1,73 +0,0 @@ -import moment from 'moment' - -Template.adminInfo.helpers - isReady: -> - return Template.instance().ready.get() - statistics: -> - return Template.instance().statistics.get() - instances: -> - return Template.instance().instances.get() - inGB: (size) -> - if size > 1073741824 - return _.numberFormat(size / 1024 / 1024 / 1024, 2) + ' GB' - return _.numberFormat(size / 1024 / 1024, 2) + ' MB' - humanReadableTime: (time) -> - days = Math.floor time / 86400 - hours = Math.floor (time % 86400) / 3600 - minutes = Math.floor ((time % 86400) % 3600) / 60 - seconds = Math.floor ((time % 86400) % 3600) % 60 - out = "" - if days > 0 - out += "#{days} #{TAPi18n.__ 'days'}, " - if hours > 0 - out += "#{hours} #{TAPi18n.__ 'hours'}, " - if minutes > 0 - out += "#{minutes} #{TAPi18n.__ 'minutes'}, " - if seconds > 0 - out += "#{seconds} #{TAPi18n.__ 'seconds'}" - return out - formatDate: (date) -> - if date - return moment(date).format("LLL") - numFormat: (number) -> - return _.numberFormat(number, 2) - info: -> - return RocketChat.Info - build: -> - return RocketChat.Info?.compile || RocketChat.Info?.build - -Template.adminInfo.events - 'click .refresh': (e, instance) -> - instance.ready.set false - Meteor.call 'getStatistics', true, (error, statistics) -> - instance.ready.set true - if error - handleError(error) - else - instance.statistics.set statistics - -Template.adminInfo.onRendered -> - Tracker.afterFlush -> - SideNav.setFlex "adminFlex" - SideNav.openFlex() - -Template.adminInfo.onCreated -> - instance = @ - @statistics = new ReactiveVar {} - @instances = new ReactiveVar [] - @ready = new ReactiveVar false - - if RocketChat.authz.hasAllPermission('view-statistics') - Meteor.call 'getStatistics', (error, statistics) -> - if error - handleError(error) - else - instance.statistics.set statistics - - Meteor.call 'instances/get', (error, instances) -> - instance.ready.set true - if error - handleError(error) - else - instance.instances.set instances - diff --git a/packages/rocketchat-ui-admin/client/adminInfo.js b/packages/rocketchat-ui-admin/client/adminInfo.js index 2e527fe21b9..a3a2874ed27 100644 --- a/packages/rocketchat-ui-admin/client/adminInfo.js +++ b/packages/rocketchat-ui-admin/client/adminInfo.js @@ -7,6 +7,9 @@ Template.adminInfo.helpers({ statistics() { return Template.instance().statistics.get(); }, + instances() { + return Template.instance().instances.get(); + }, inGB(size) { if (size > 1073741824) { return `${ _.numberFormat(size / 1024 / 1024 / 1024, 2) } GB`; @@ -73,14 +76,24 @@ Template.adminInfo.onRendered(function() { Template.adminInfo.onCreated(function() { const instance = this; this.statistics = new ReactiveVar({}); + this.instances = new ReactiveVar({}); this.ready = new ReactiveVar(false); if (RocketChat.authz.hasAllPermission('view-statistics')) { - return Meteor.call('getStatistics', function(error, statistics) { + Meteor.call('getStatistics', function(error, statistics) { instance.ready.set(true); if (error) { - return handleError(error); + handleError(error); } else { - return instance.statistics.set(statistics); + instance.statistics.set(statistics); + } + }); + + Meteor.call('instances/get', function(error, instances) { + instance.ready.set(true); + if (error) { + handleError(error); + } else { + instance.instances.set(instances); } }); } diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js b/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js index 44434a63191..dd2ca493ca4 100644 --- a/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js +++ b/packages/rocketchat-ui-admin/client/rooms/adminRoomInfo.js @@ -32,7 +32,6 @@ Template.adminRoomInfo.helpers({ }, roomName() { const room = AdminChatRoom.findOne(this.rid, { fields: { name: 1 } }); - console.log(room); return room && room.name; }, roomTopic() { @@ -75,7 +74,7 @@ Template.adminRoomInfo.helpers({ Template.adminRoomInfo.events({ 'click .delete'() { - return swal({ + swal({ title: t('Are_you_sure'), text: t('Delete_Room_Warning'), type: 'warning', @@ -87,12 +86,12 @@ Template.adminRoomInfo.events({ html: false }, () => { swal.disableButtons(); - return Meteor.call('eraseRoom', this.rid, function(error) { + Meteor.call('eraseRoom', this.rid, function(error) { if (error) { handleError(error); - return swal.enableButtons(); + swal.enableButtons(); } else { - return swal({ + swal({ title: t('Deleted'), text: t('Room_has_been_deleted'), type: 'success', @@ -106,23 +105,23 @@ Template.adminRoomInfo.events({ 'keydown input[type=text]'(e, t) { if (e.keyCode === 13) { e.preventDefault(); - return t.saveSetting(this.rid); + t.saveSetting(this.rid); } }, 'click [data-edit]'(e, t) { e.preventDefault(); t.editing.set($(e.currentTarget).data('edit')); return setTimeout((function() { - return t.$('input.editing').focus().select(); + t.$('input.editing').focus().select(); }), 100); }, 'click .cancel'(e, t) { e.preventDefault(); - return t.editing.set(); + t.editing.set(); }, 'click .save'(e, t) { e.preventDefault(); - return t.saveSetting(this.rid); + t.saveSetting(this.rid); } }); @@ -131,9 +130,7 @@ Template.adminRoomInfo.onCreated(function() { this.validateRoomType = () => { const type = this.$('input[name=roomType]:checked').val(); if (type !== 'c' && type !== 'p') { - toastr.error(t('error-invalid-room-type', { - type - })); + toastr.error(t('error-invalid-room-type', { type })); } return true; }; @@ -161,7 +158,7 @@ Template.adminRoomInfo.onCreated(function() { this.validateRoomTopic = () => { return true; }; - return this.saveSetting = (rid) => { + this.saveSetting = (rid) => { switch (this.editing.get()) { case 'roomName': if (this.validateRoomName(rid)) { @@ -170,7 +167,7 @@ Template.adminRoomInfo.onCreated(function() { if (err) { return handleError(err); } - return toastr.success(TAPi18n.__('Room_name_changed_successfully')); + toastr.success(TAPi18n.__('Room_name_changed_successfully')); }); } break; @@ -181,7 +178,7 @@ Template.adminRoomInfo.onCreated(function() { return handleError(err); } toastr.success(TAPi18n.__('Room_topic_changed_successfully')); - return RocketChat.callbacks.run('roomTopicChanged', AdminChatRoom.findOne(rid)); + RocketChat.callbacks.run('roomTopicChanged', AdminChatRoom.findOne(rid)); }); } break; @@ -192,7 +189,7 @@ Template.adminRoomInfo.onCreated(function() { return handleError(err); } toastr.success(TAPi18n.__('Room_announcement_changed_successfully')); - return RocketChat.callbacks.run('roomAnnouncementChanged', AdminChatRoom.findOne(rid)); + RocketChat.callbacks.run('roomAnnouncementChanged', AdminChatRoom.findOne(rid)); }); } break; @@ -201,19 +198,15 @@ Template.adminRoomInfo.onCreated(function() { if (this.validateRoomType(rid)) { RocketChat.callbacks.run('roomTypeChanged', AdminChatRoom.findOne(rid)); const saveRoomSettings = function() { - return Meteor.call('saveRoomSettings', rid, 'roomType', val, function(err) { + Meteor.call('saveRoomSettings', rid, 'roomType', val, function(err) { if (err) { return handleError(err); } else { - return toastr.success(TAPi18n.__('Room_type_changed_successfully')); + toastr.success(TAPi18n.__('Room_type_changed_successfully')); } }); }; - if (!AdminChatRoom.findOne(rid, { - fields: { - 'default': 1 - } - })['default']) { + if (!AdminChatRoom.findOne(rid, { fields: { 'default': 1 }})['default']) { return saveRoomSettings(); } swal({ @@ -239,7 +232,7 @@ Template.adminRoomInfo.onCreated(function() { return handleError(err); } toastr.success(TAPi18n.__('Room_archived')); - return RocketChat.callbacks.run('archiveRoom', AdminChatRoom.findOne(rid)); + RocketChat.callbacks.run('archiveRoom', AdminChatRoom.findOne(rid)); }); } } else if ((room && room.archived) === true) { @@ -248,7 +241,7 @@ Template.adminRoomInfo.onCreated(function() { return handleError(err); } toastr.success(TAPi18n.__('Room_unarchived')); - return RocketChat.callbacks.run('unarchiveRoom', AdminChatRoom.findOne(rid)); + RocketChat.callbacks.run('unarchiveRoom', AdminChatRoom.findOne(rid)); }); } break; @@ -257,9 +250,9 @@ Template.adminRoomInfo.onCreated(function() { if (err) { return handleError(err); } - return toastr.success(TAPi18n.__('Read_only_changed_successfully')); + toastr.success(TAPi18n.__('Read_only_changed_successfully')); }); } - return this.editing.set(); + this.editing.set(); }; }); diff --git a/packages/rocketchat-ui-admin/client/rooms/adminRooms.js b/packages/rocketchat-ui-admin/client/rooms/adminRooms.js index 6d244bf7b49..878eb4d69c3 100644 --- a/packages/rocketchat-ui-admin/client/rooms/adminRooms.js +++ b/packages/rocketchat-ui-admin/client/rooms/adminRooms.js @@ -92,7 +92,7 @@ Template.adminRooms.onCreated(function() { } const limit = instance.limit.get(); const subscription = instance.subscribe('adminRooms', filter, types, limit); - return instance.ready.set(subscription.ready()); + instance.ready.set(subscription.ready()); }); this.rooms = function() { let filter; @@ -107,32 +107,15 @@ Template.adminRooms.onCreated(function() { filter = _.trim(filter); if (filter) { const filterReg = new RegExp(s.escapeRegExp(filter), 'i'); - query = { - $or: [ - { - name: filterReg - }, { - t: 'd', - usernames: filterReg - } - ] - }; + query = { $or: [{ name: filterReg }, { t: 'd', usernames: filterReg } ]}; } if (types.length) { - query['t'] = { - $in: types - }; + query['t'] = { $in: types }; } const limit = instance.limit && instance.limit.get(); - return AdminChatRoom.find(query, { - limit, - sort: { - 'default': -1, - name: 1 - } - }); + return AdminChatRoom.find(query, { limit, sort: { 'default': -1, name: 1}}); }; - return this.getSearchTypes = function() { + this.getSearchTypes = function() { return _.map($('[name=room-type]:checked'), function(input) { return $(input).val(); }); @@ -140,9 +123,9 @@ Template.adminRooms.onCreated(function() { }); Template.adminRooms.onRendered(function() { - return Tracker.afterFlush(function() { + Tracker.afterFlush(function() { SideNav.setFlex('adminFlex'); - return SideNav.openFlex(); + SideNav.openFlex(); }); }); @@ -150,27 +133,27 @@ Template.adminRooms.events({ 'keydown #rooms-filter'(e) { if (e.which === 13) { e.stopPropagation(); - return e.preventDefault(); + e.preventDefault(); } }, 'keyup #rooms-filter'(e, t) { e.stopPropagation(); e.preventDefault(); - return t.filter.set(e.currentTarget.value); + t.filter.set(e.currentTarget.value); }, 'click .room-info'(e, instance) { e.preventDefault(); Session.set('adminRoomsSelected', { rid: this._id }); - return instance.tabBar.open('admin-room'); + instance.tabBar.open('admin-room'); }, 'click .load-more'(e, t) { e.preventDefault(); e.stopPropagation(); - return t.limit.set(t.limit.get() + 50); + t.limit.set(t.limit.get() + 50); }, 'change [name=room-type]'(e, t) { - return t.types.set(t.getSearchTypes()); + t.types.set(t.getSearchTypes()); } }); diff --git a/packages/rocketchat-ui-admin/client/users/adminInviteUser.js b/packages/rocketchat-ui-admin/client/users/adminInviteUser.js index 1c456bed961..c39c766a0e4 100644 --- a/packages/rocketchat-ui-admin/client/users/adminInviteUser.js +++ b/packages/rocketchat-ui-admin/client/users/adminInviteUser.js @@ -18,29 +18,29 @@ Template.adminInviteUser.events({ } })); if (validEmails.length) { - return Meteor.call('sendInvitationEmail', validEmails, function(error, result) { + Meteor.call('sendInvitationEmail', validEmails, function(error, result) { if (result) { instance.clearForm(); instance.inviteEmails.set(validEmails); } if (error) { - return handleError(error); + handleError(error); } }); } else { - return toastr.error(t('Send_invitation_email_error')); + toastr.error(t('Send_invitation_email_error')); } }, 'click .cancel'(e, instance) { instance.clearForm(); instance.inviteEmails.set([]); - return Template.currentData().tabBar.close(); + Template.currentData().tabBar.close(); } }); Template.adminInviteUser.onCreated(function() { this.inviteEmails = new ReactiveVar([]); - return this.clearForm = function() { - return $('#inviteEmails').val(''); + this.clearForm = function() { + $('#inviteEmails').val(''); }; }); diff --git a/packages/rocketchat-ui-admin/client/users/adminUsers.js b/packages/rocketchat-ui-admin/client/users/adminUsers.js index 14df3898001..1562e6a095c 100644 --- a/packages/rocketchat-ui-admin/client/users/adminUsers.js +++ b/packages/rocketchat-ui-admin/client/users/adminUsers.js @@ -79,17 +79,7 @@ Template.adminUsers.onCreated(function() { if (filter) { const filterReg = new RegExp(s.escapeRegExp(filter), 'i'); - query = { - $or: [ - { - username: filterReg - }, { - name: filterReg - }, { - 'emails.address': filterReg - } - ] - }; + query = {$or: [{ username: filterReg }, { name: filterReg}, { 'emails.address': filterReg }]}; } else { query = {}; } @@ -103,9 +93,9 @@ Template.adminUsers.onCreated(function() { }); Template.adminUsers.onRendered(function() { - return Tracker.afterFlush(function() { + Tracker.afterFlush(function() { SideNav.setFlex('adminFlex'); - return SideNav.openFlex(); + SideNav.openFlex(); }); }); @@ -113,29 +103,29 @@ Template.adminUsers.events({ 'keydown #users-filter'(e) { if (e.which === 13) { e.stopPropagation(); - return e.preventDefault(); + e.preventDefault(); } }, 'keyup #users-filter'(e, t) { e.stopPropagation(); e.preventDefault(); - return t.filter.set(e.currentTarget.value); + t.filter.set(e.currentTarget.value); }, 'click .user-info'(e, instance) { e.preventDefault(); instance.tabBarData.set(Meteor.users.findOne(this._id)); - return instance.tabBar.open('admin-user-info'); + instance.tabBar.open('admin-user-info'); }, 'click .info-tabs button'(e) { e.preventDefault(); $('.info-tabs button').removeClass('active'); $(e.currentTarget).addClass('active'); $('.user-info-content').hide(); - return $($(e.currentTarget).attr('href')).show(); + $($(e.currentTarget).attr('href')).show(); }, 'click .load-more'(e, t) { e.preventDefault(); e.stopPropagation(); - return t.limit.set(t.limit.get() + 50); + t.limit.set(t.limit.get() + 50); } }); diff --git a/packages/rocketchat-ui-admin/package.js b/packages/rocketchat-ui-admin/package.js index abeab32fe32..619e158cbdb 100644 --- a/packages/rocketchat-ui-admin/package.js +++ b/packages/rocketchat-ui-admin/package.js @@ -15,7 +15,6 @@ Package.onUse(function(api) { 'mongo', 'ecmascript', 'templating', - 'coffeescript', 'underscore', 'rocketchat:lib' ]); @@ -37,7 +36,6 @@ Package.onUse(function(api) { api.addFiles('client/users/adminUserInfo.html', 'client'); api.addFiles('client/users/adminUsers.html', 'client'); - // coffee files api.addFiles('client/admin.js', 'client'); api.addFiles('client/adminFlex.js', 'client'); api.addFiles('client/adminInfo.js', 'client');