diff --git a/client/modules/crm/src/views/account/fields/shipping-address.js b/client/modules/crm/src/views/account/fields/shipping-address.js index bea24980f0..623c3d9eb2 100644 --- a/client/modules/crm/src/views/account/fields/shipping-address.js +++ b/client/modules/crm/src/views/account/fields/shipping-address.js @@ -79,27 +79,32 @@ define('crm:views/account/fields/shipping-address', 'views/fields/address', func }, copy: function (fieldFrom) { - var attrList = Object.keys(this.getMetadata().get('fields.address.fields')).forEach(function (attr) { - destField = this.name + Espo.Utils.upperCaseFirst(attr); - sourceField = fieldFrom + Espo.Utils.upperCaseFirst(attr); + Object.keys(this.getMetadata().get('fields.address.fields')) + .forEach(attr => { + let destField = this.name + Espo.Utils.upperCaseFirst(attr); + let sourceField = fieldFrom + Espo.Utils.upperCaseFirst(attr); - this.model.set(destField, this.model.get(sourceField)); - }, this); + this.model.set(destField, this.model.get(sourceField)); + }); }, toShowCopyButton: function () { var billingIsNotEmpty = false; var shippingIsNotEmpty = false; - this.attributePartList.forEach(function (part) { - var attribute = this.copyFrom + Espo.Utils.upperCaseFirst(part); - if (this.model.get(attribute)) { + + this.attributePartList.forEach(part => { + let attribute1 = this.copyFrom + Espo.Utils.upperCaseFirst(part); + + if (this.model.get(attribute1)) { billingIsNotEmpty = true; } - var attribute = this.name + Espo.Utils.upperCaseFirst(part); - if (this.model.get(attribute)) { + + let attribute2 = this.name + Espo.Utils.upperCaseFirst(part); + + if (this.model.get(attribute2)) { shippingIsNotEmpty = true; } - }, this); + }); return billingIsNotEmpty && !shippingIsNotEmpty; }, diff --git a/client/src/app.js b/client/src/app.js index 9a6e807450..b930084a9a 100644 --- a/client/src/app.js +++ b/client/src/app.js @@ -902,7 +902,7 @@ function ( this.broadcastChannel = null; - xhr = new XMLHttpRequest; + let xhr = new XMLHttpRequest; xhr.open('GET', this.basePath + this.apiUrl + '/'); xhr.setRequestHeader('Authorization', 'Basic ' + Base64.encode('**logout:logout')); diff --git a/client/src/email-helper.js b/client/src/email-helper.js index 09de5401d7..02e1834353 100644 --- a/client/src/email-helper.js +++ b/client/src/email-helper.js @@ -340,7 +340,7 @@ define('email-helper', [], function () { } if (model.get('dateSent')) { - line = this.getLanguage().translate('dateSent', 'fields', 'Email') + ': '; + let line = this.getLanguage().translate('dateSent', 'fields', 'Email') + ': '; line += this.getDateTime().toDisplayDateTime(model.get('dateSent')); list.push(line); diff --git a/client/src/views/email/detail.js b/client/src/views/email/detail.js index 1906a7cf93..0a291d22de 100644 --- a/client/src/views/email/detail.js +++ b/client/src/views/email/detail.js @@ -449,7 +449,7 @@ define('views/email/detail', ['views/detail', 'email-helper'], function (Dep, Em id: this.model.id, }) .then(duplicateAttributes => { - model = this.model.clone(); + let model = this.model.clone(); model.set('body', duplicateAttributes.body); diff --git a/client/src/views/external-account/oauth2.js b/client/src/views/external-account/oauth2.js index 8ceb4b6180..401a79c737 100644 --- a/client/src/views/external-account/oauth2.js +++ b/client/src/views/external-account/oauth2.js @@ -195,6 +195,7 @@ Espo.define('views/external-account/oauth2', ['view', 'model'], function (Dep, M var arr = []; var params = (options.params || {}); + for (var name in params) { if (params[name]) { arr.push(name + '=' + encodeURI(params[name])); @@ -207,35 +208,42 @@ Espo.define('views/external-account/oauth2', ['view', 'model'], function (Dep, M var error = null; str = str.substr(str.indexOf('?') + 1, str.length); - str.split('&').forEach(function (part) { + + str.split('&').forEach((part) => { var arr = part.split('='); var name = decodeURI(arr[0]); var value = decodeURI(arr[1] || ''); - if (name == 'code') { + if (name === 'code') { code = value; } - if (name == 'error') { + + if (name === 'error') { error = value; } - }, this); + }); + if (code) { return { code: code, - } + }; } else if (error) { return { error: error, - } + }; } } - popup = window.open(path, options.windowName, options.windowOptions); - interval = window.setInterval(function () { + let popup = window.open(path, options.windowName, options.windowOptions); + + let interval; + + interval = window.setInterval(() => { if (popup.closed) { window.clearInterval(interval); } else { var res = parseUrl(popup.location.href.toString()); + if (res) { callback.call(self, res); popup.close(); diff --git a/client/src/views/fields/email.js b/client/src/views/fields/email.js index fb980f2e60..01f9f3d023 100644 --- a/client/src/views/fields/email.js +++ b/client/src/views/fields/email.js @@ -248,12 +248,12 @@ define('views/fields/email', ['views/fields/varchar'], function (Dep) { 'click [data-action="addEmailAddress"]': function () { var data = Espo.Utils.cloneDeep(this.fetchEmailAddressData()); - o = { + let o = { emailAddress: '', primary: data.length ? false : true, optOut: this.emailAddressOptedOutByDefault, invalid: false, - lower: '' + lower: '', }; data.push(o); diff --git a/client/src/views/fields/phone.js b/client/src/views/fields/phone.js index f2ae3c07be..1f383e8719 100644 --- a/client/src/views/fields/phone.js +++ b/client/src/views/fields/phone.js @@ -257,7 +257,7 @@ define('views/fields/phone', ['views/fields/varchar'], function (Dep) { 'click [data-action="addPhoneNumber"]': function () { var data = Espo.Utils.cloneDeep(this.fetchPhoneNumberData()); - o = { + let o = { phoneNumber: '', primary: !data.length, type: false, diff --git a/client/src/views/record/list.js b/client/src/views/record/list.js index f3247c3bcd..638abd615d 100644 --- a/client/src/views/record/list.js +++ b/client/src/views/record/list.js @@ -1556,7 +1556,7 @@ function (Dep, MassActionHelper, ExportHelper) { view.close(); - count = o.count; + let count = o.count; this.collection .fetch() diff --git a/public/install/js/install.js b/public/install/js/install.js index 080c0633a8..c3b72837b0 100644 --- a/public/install/js/install.js +++ b/public/install/js/install.js @@ -423,7 +423,7 @@ InstallScript.prototype.checkSett = function(opt) { var errors = data.errors; Object.keys(errors).forEach(function (errorName) { - errorData = errors[errorName]; + let errorData = errors[errorName]; switch(errorName) { case 'phpRequires': @@ -467,7 +467,7 @@ InstallScript.prototype.checkSett = function(opt) { opt.success(data); }) .fail(function(){ - msg = self.getLang('Ajax failed', 'messages'); + let msg = self.getLang('Ajax failed', 'messages'); self.showMsg({msg: msg, error: true}); opt.error(); }) @@ -518,7 +518,7 @@ InstallScript.prototype.validate = function() { $('[name="thousandSeparator"]').parent().parent().addClass('has-error'); $('[name="decimalMark"]').parent().parent().addClass('has-error'); - msg = this.getLang('Thousand Separator and Decimal Mark equal', 'messages'); + let msg = this.getLang('Thousand Separator and Decimal Mark equal', 'messages'); this.showMsg({msg: msg, error: true}); valid = false; }