From 645c21f2f730ddf4005e88d2b3d296922926a6fe Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 21 Aug 2017 16:46:43 +0100 Subject: [PATCH] Correct eslint fails --- .../javascripts/admin/chat-route-map.js.es6 | 8 ++-- .../admin-plugins-chat-provider.js.es6 | 18 +++---- .../controllers/admin-plugins-chat.js.es6 | 2 +- .../admin-plugins-chat-edit-channel.js.es6 | 8 ++-- .../admin-plugins-chat-edit-rule.js.es6 | 4 +- .../modals/admin-plugins-chat-test.js.es6 | 48 +++++++++---------- .../javascripts/admin/models/provider.js.es6 | 2 +- assets/javascripts/admin/models/rule.js.es6 | 2 +- .../routes/admin-plugins-chat-index.js.es6 | 2 +- .../acceptance/chat-integration-test.js.es6 | 4 +- 10 files changed, 49 insertions(+), 49 deletions(-) diff --git a/assets/javascripts/admin/chat-route-map.js.es6 b/assets/javascripts/admin/chat-route-map.js.es6 index 92b74e4..b666749 100644 --- a/assets/javascripts/admin/chat-route-map.js.es6 +++ b/assets/javascripts/admin/chat-route-map.js.es6 @@ -3,9 +3,9 @@ export default { path: '/plugins', map() { this.route('chat', function(){ - this.route('provider', {path: '/:provider'}); - }); - - + this.route('provider', {path: '/:provider'}); + }); + + } }; \ No newline at end of file diff --git a/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6 b/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6 index 29684a1..0843463 100644 --- a/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6 +++ b/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6 @@ -1,7 +1,7 @@ import showModal from 'discourse/lib/show-modal'; export default Ember.Controller.extend({ - modalShowing: false, + modalShowing: false, anyErrors: function(){ var anyErrors = false; @@ -14,16 +14,16 @@ export default Ember.Controller.extend({ }.property('model.channels'), actions:{ - createChannel(){ - this.set('modalShowing', true); + createChannel(){ + this.set('modalShowing', true); var model = {channel: this.store.createRecord('channel',{provider: this.get('model.provider').id, data:{}},), provider:this.get('model.provider')}; - showModal('admin-plugins-chat-edit-channel', { model: model, admin: true }); - }, - editChannel(channel){ - this.set('modalShowing', true); + showModal('admin-plugins-chat-edit-channel', { model: model, admin: true }); + }, + editChannel(channel){ + this.set('modalShowing', true); var model = {channel: channel, provider: this.get('model.provider')}; - showModal('admin-plugins-chat-edit-channel', { model: model, admin: true }); - }, + showModal('admin-plugins-chat-edit-channel', { model: model, admin: true }); + }, testChannel(channel){ this.set('modalShowing', true); var model = {channel:channel}; diff --git a/assets/javascripts/admin/controllers/admin-plugins-chat.js.es6 b/assets/javascripts/admin/controllers/admin-plugins-chat.js.es6 index 9a0501a..4ee344f 100644 --- a/assets/javascripts/admin/controllers/admin-plugins-chat.js.es6 +++ b/assets/javascripts/admin/controllers/admin-plugins-chat.js.es6 @@ -1,3 +1,3 @@ export default Ember.Controller.extend({ - + }); \ No newline at end of file diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6 b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6 index 5eb4c0c..d360bca 100644 --- a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6 +++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6 @@ -64,7 +64,7 @@ export default Ember.Controller.extend(ModalFunctionality, { saveDisabled: function(){ var validations = this.get('paramValidation'); - + if(!validations){ return true; } var invalid = false; @@ -77,7 +77,7 @@ export default Ember.Controller.extend(ModalFunctionality, { invalid = true; } }); - + return invalid; }.property('paramValidation'), @@ -89,9 +89,9 @@ export default Ember.Controller.extend(ModalFunctionality, { save: function(){ if(this.get('saveDisabled')){return;}; - const self = this; + const self = this; - this.get('model.channel').save().then(function() { + this.get('model.channel').save().then(function() { self.send('closeModal'); }).catch(function(error) { self.flash(extractError(error), 'error'); diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6 b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6 index f4fc0ee..0ae39e0 100644 --- a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6 +++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6 @@ -30,9 +30,9 @@ export default Ember.Controller.extend(ModalFunctionality, { save: function(){ if(this.get('saveDisabled')){return;}; - const self = this; + const self = this; - this.get('model.rule').save().then(function() { + this.get('model.rule').save().then(function() { self.send('closeModal'); }).catch(function(error) { self.flash(extractError(error), 'error'); diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 index 31a9968..81a5f46 100644 --- a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 +++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 @@ -2,7 +2,7 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; import { ajax } from 'discourse/lib/ajax'; export default Ember.Controller.extend(ModalFunctionality, { - setupKeydown: function() { + setupKeydown: function() { Ember.run.schedule('afterRender', () => { $('#chat_integration_test_modal').keydown(e => { if (e.keyCode === 13) { @@ -13,41 +13,41 @@ export default Ember.Controller.extend(ModalFunctionality, { }.on('init'), sendDisabled: function(){ - if(this.get('model').topic_id){ - return false; - } - return true; - }.property('model.topic_id'), + if(this.get('model').topic_id){ + return false; + } + return true; + }.property('model.topic_id'), - actions: { + actions: { - send: function(){ + send: function(){ if(this.get('sendDisabled')){return;}; - self = this; - this.set('loading', true); - ajax("/admin/plugins/chat/test", { - data: { channel_id: this.get('model.channel.id'), - topic_id: this.get('model.topic_id') - }, + self = this; + this.set('loading', true); + ajax("/admin/plugins/chat/test", { + data: { channel_id: this.get('model.channel.id'), + topic_id: this.get('model.topic_id') + }, type: 'POST' }).then(function () { self.set('loading', false); self.flash(I18n.t('chat_integration.test_modal.success'), 'success'); }, function(e) { - self.set('loading', false); - - var response = e.jqXHR.responseJSON; - var error_key = 'chat_integration.test_modal.error'; + self.set('loading', false); - if(response['error_key']){ - error_key = response['error_key']; + var response = e.jqXHR.responseJSON; + var error_key = 'chat_integration.test_modal.error'; + + if(response['error_key']){ + error_key = response['error_key']; } self.flash(I18n.t(error_key), 'error'); - - }); - } - } + }); + } + + } }); \ No newline at end of file diff --git a/assets/javascripts/admin/models/provider.js.es6 b/assets/javascripts/admin/models/provider.js.es6 index 7a43358..41d886a 100644 --- a/assets/javascripts/admin/models/provider.js.es6 +++ b/assets/javascripts/admin/models/provider.js.es6 @@ -1,5 +1,5 @@ import RestModel from 'discourse/models/rest'; export default RestModel.extend({ - + }); diff --git a/assets/javascripts/admin/models/rule.js.es6 b/assets/javascripts/admin/models/rule.js.es6 index f3c4770..cf4b798 100644 --- a/assets/javascripts/admin/models/rule.js.es6 +++ b/assets/javascripts/admin/models/rule.js.es6 @@ -22,7 +22,7 @@ export default RestModel.extend({ type: 'normal', error_key: null, - + removeUnneededInfo: function(){ const type=this.get('type'); if(type==='normal'){ diff --git a/assets/javascripts/admin/routes/admin-plugins-chat-index.js.es6 b/assets/javascripts/admin/routes/admin-plugins-chat-index.js.es6 index 313e65c..03fd012 100644 --- a/assets/javascripts/admin/routes/admin-plugins-chat-index.js.es6 +++ b/assets/javascripts/admin/routes/admin-plugins-chat-index.js.es6 @@ -1,6 +1,6 @@ export default Discourse.Route.extend({ afterModel(model) { - + if(model.totalRows > 0){ this.transitionTo('adminPlugins.chat.provider', model.get('firstObject').name); } diff --git a/test/javascripts/acceptance/chat-integration-test.js.es6 b/test/javascripts/acceptance/chat-integration-test.js.es6 index aa2a664..bfc41f3 100644 --- a/test/javascripts/acceptance/chat-integration-test.js.es6 +++ b/test/javascripts/acceptance/chat-integration-test.js.es6 @@ -1,5 +1,5 @@ import { acceptance } from "helpers/qunit-helpers"; -acceptance("Chat Integration", { +acceptance("Chat Integration", { loggedIn: true, beforeEach() { @@ -23,7 +23,7 @@ acceptance("Chat Integration", { }); server.put('/admin/plugins/chat/channels/:id', () => { // eslint-disable-line no-undef return response({ }); - }); + }); server.delete('/admin/plugins/chat/channels/:id', () => { // eslint-disable-line no-undef return response({ }); });