Skip to content

Commit e8fd64f

Browse files
MAGETWO-56849: Clean Up JS files code styles based on black list
1 parent 8913695 commit e8fd64f

File tree

26 files changed

+137
-121
lines changed

26 files changed

+137
-121
lines changed

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ define([
244244
emailValidationResult = customer.isLoggedIn(),
245245
field;
246246

247-
if (!quote.shippingMethod()) {
248-
this.errorValidationMessage($t('Please specify a shipping method.'));
247+
if (!quote.shippingMethod()) {
248+
this.errorValidationMessage($t('Please specify a shipping method.'));
249249

250250
return false;
251251
}

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/configurable.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ define([
314314

315315
/**
316316
* Reload price.
317+
*
317318
* @return {undefined|Number}
318319
*/
319320
reloadPrice: function () {
@@ -324,7 +325,7 @@ define([
324325
i, selected;
325326

326327
if (this.config.disablePriceReload) {
327-
return;
328+
return undefined;
328329
}
329330

330331
for (i = this.settings.length - 1; i >= 0; i--) {

app/code/Magento/Customer/view/frontend/web/js/view/authentication-popup.js

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -66,30 +66,29 @@ define([
6666
}
6767
},
6868

69-
/**
70-
* Provide login action
71-
*
72-
* @return {Boolean}
73-
*/
74-
login: function (formUiElement, event) {
75-
var loginData = {},
76-
formElement = $(event.currentTarget),
77-
formDataArray = formElement.serializeArray();
78-
79-
event.stopPropagation();
80-
formDataArray.forEach(function (entry) {
81-
loginData[entry.name] = entry.value;
82-
});
69+
/**
70+
* Provide login action
71+
*
72+
* @return {Boolean}
73+
*/
74+
login: function (formUiElement, event) {
75+
var loginData = {},
76+
formElement = $(event.currentTarget),
77+
formDataArray = formElement.serializeArray();
8378

84-
if (formElement.validation() &&
85-
formElement.validation('isValid')
86-
) {
87-
this.isLoading(true);
88-
loginAction(loginData);
89-
}
79+
event.stopPropagation();
80+
formDataArray.forEach(function (entry) {
81+
loginData[entry.name] = entry.value;
82+
});
9083

91-
return false;
84+
if (formElement.validation() &&
85+
formElement.validation('isValid')
86+
) {
87+
this.isLoading(true);
88+
loginAction(loginData);
9289
}
93-
});
94-
}
95-
);
90+
91+
return false;
92+
}
93+
});
94+
});

app/code/Magento/Ui/view/base/web/js/form/form.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ define([
3838
* @returns {Object}
3939
*/
4040
function collectData(items) {
41-
var result = {};
41+
var result = {},
42+
name;
4243

4344
items = Array.prototype.slice.call(items);
4445

@@ -55,7 +56,7 @@ define([
5556
break;
5657

5758
case 'select-multiple':
58-
var name = item.name.substring(0,(item.name.length - 2)); //remove [] from the name ending
59+
name = item.name.substring(0, item.name.length - 2); //remove [] from the name ending
5960
result[name] = _.pluck(item.selectedOptions, 'value');
6061
break;
6162

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ define([
7979
params = {
8080
url: obj.urls.beforeSave,
8181
data: _.extend(data, {
82-
form_key: 'magentoFormKey'
82+
'form_key': 'magentoFormKey'
8383
}),
8484
success: jasmine.any(Function),
8585
complete: jasmine.any(Function)
@@ -102,7 +102,7 @@ define([
102102

103103
expect($.ajax).not.toHaveBeenCalled();
104104
});
105-
it('Check call "beforeSave" method. Check "success" ajax callback with success response.' , function () {
105+
it('Check call "beforeSave" method. Check "success" ajax callback with success response.', function () {
106106
var request;
107107

108108
$.ajax = jasmine.createSpy().and.callFake(function (req) {
@@ -112,11 +112,13 @@ define([
112112
obj.urls.beforeSave = 'requestPath';
113113
obj.save();
114114

115-
expect(request({error: false})).toBe(true);
115+
expect(request({
116+
error: false
117+
})).toBe(true);
116118
expect($('body').notification).not.toHaveBeenCalledWith('clear');
117119
});
118120

119-
it('Check call "beforeSave" method. Check "success" ajax callback with error response.' , function () {
121+
it('Check call "beforeSave" method. Check "success" ajax callback with error response.', function () {
120122
var request,
121123
notificationArguments;
122124

@@ -140,7 +142,7 @@ define([
140142
})).toBeUndefined();
141143
expect($('body').notification.calls.allArgs()).toEqual([['clear'], ['add', notificationArguments]]);
142144
});
143-
it('Check call "beforeSave" method. Check "complete" ajax callback.' , function () {
145+
it('Check call "beforeSave" method. Check "complete" ajax callback.', function () {
144146
var request;
145147

146148
$.ajax = jasmine.createSpy().and.callFake(function (req) {

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ define([
1515
on: jasmine.createSpy()
1616
},
1717
'Magento_Ui/js/lib/registry/registry': {
18-
get: function() {
18+
/** Method stub. */
19+
get: function () {
1920
return {
2021
get: jasmine.createSpy(),
2122
set: jasmine.createSpy()

dev/tests/js/jasmine/tests/lib/mage/misc.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ define([
2525
data = {
2626
key: 'value-prepared-before-save'
2727
};
28+
2829
expect(utils.filterFormData(data, suffix, separator)).toEqual(data);
2930
expect(utils.filterFormData(data, suffix)).toEqual(data);
3031
expect(utils.filterFormData(data)).toEqual(data);

lib/web/mage/adminhtml/browser.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ define([
125125

126126
/**
127127
* @param {jQuery.Event} event
128-
* @param {Object}data
128+
* @param {Object} data
129129
* @private
130130
*/
131131
_selectNode: function (event, data) {
@@ -151,7 +151,7 @@ define([
151151
},
152152

153153
/**
154-
* @param {Obejct} element
154+
* @param {Object} element
155155
* @param {*} value
156156
*/
157157
insertAtCursor: function (element, value) {
@@ -181,7 +181,7 @@ define([
181181
},
182182

183183
/**
184-
* @param {Obejct} node
184+
* @param {Object} node
185185
*/
186186
loadFileList: function (node) {
187187
var contentBlock = this.element.find('#contents');
@@ -285,7 +285,7 @@ define([
285285
* in document:
286286
* - element with target ID
287287
*
288-
* return HTMLelement | null
288+
* return {HTMLElement|null}
289289
*/
290290
getTargetElement: function () {
291291
var opener, targetElementId;
@@ -303,7 +303,7 @@ define([
303303
/**
304304
* Return opener Window object if it exists, not closed and editor is active
305305
*
306-
* return object | null
306+
* return {Object|null}
307307
*/
308308
getMediaBrowserOpener: function () {
309309
if (typeof tinyMCE != 'undefined' &&

lib/web/mage/adminhtml/events.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ define([
101101
if (this.arrEvents[evtName][i].asynch) {
102102
eventArgs = arguments[1];
103103
method = this.arrEvents[evtName][i].method.bind(this);
104-
setTimeout(function () { //eslint-disable-line no-loop-func, no-extra-bind
104+
setTimeout(function () { //eslint-disable-line no-loop-func
105105
method(eventArgs);
106-
}.bind(this), 10);
106+
}, 10);
107107
} else {
108108
result = this.arrEvents[evtName][i].method(arguments[1]);
109109
}

lib/web/mage/adminhtml/form.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ define([
133133
this.config = regions.config;
134134
delete regions.config;
135135
this.regions = regions;
136-
this.disableAction = typeof disableAction == 'undefined' ? 'hide' : disableAction;
137-
this.clearRegionValueOnDisable = typeof clearRegionValueOnDisable == 'undefined' ?
136+
this.disableAction = typeof disableAction === 'undefined' ? 'hide' : disableAction;
137+
this.clearRegionValueOnDisable = typeof clearRegionValueOnDisable === 'undefined' ?
138138
false : clearRegionValueOnDisable;
139139

140140
if (this.regionSelectEl.options.length <= 1) {

0 commit comments

Comments
 (0)