Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ESLint errors fix #9091

Merged
merged 3 commits into from
May 16, 2017
Merged

ESLint errors fix #9091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2e50df
Updated whitelist and blacklist to target more JS files
Igloczek May 4, 2017
398e395
Automatic refactor using fix flag for ESLint and JSCS
Igloczek May 4, 2017
05ea5cd
Manual fixes for ESLint and JSCS reported issues
Igloczek May 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
595 changes: 310 additions & 285 deletions app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js
View file
Open in desktop

Large diffs are not rendered by default.

184 changes: 126 additions & 58 deletions app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
View file
Open in desktop

Large diffs are not rendered by default.

141 changes: 98 additions & 43 deletions app/code/Magento/Rule/view/adminhtml/web/rules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
*/

define([
"jquery",
'jquery',
'Magento_Ui/js/modal/alert',
"mage/translate",
"prototype"
], function(jQuery){
'mage/translate',
'prototype'
], function (jQuery) {

var VarienRulesForm = new Class.create();

VarienRulesForm.prototype = {
initialize : function(parent, newChildUrl){
initialize: function (parent, newChildUrl) {
this.parent = $(parent);
this.newChildUrl = newChildUrl;
this.shownElement = null;
Expand All @@ -26,26 +26,31 @@ define([
this.readOnly = false;

var elems = this.parent.getElementsByClassName('rule-param');
for (var i=0; i<elems.length; i++) {

for (var i = 0; i < elems.length; i++) {
this.initParam(elems[i]);
}
},

setReadonly: function (readonly){
setReadonly: function (readonly) {
this.readOnly = readonly;
var elems = this.parent.getElementsByClassName('rule-param-remove');
for (var i=0; i<elems.length; i++) {

for (var i = 0; i < elems.length; i++) {
var element = elems[i];
if (this.readOnly) {
element.hide();
} else {
element.show();
}

if (this.readOnly) {
element.hide();
} else {
element.show();
}
}

var elems = this.parent.getElementsByClassName('rule-param-new-child');
for (var i=0; i<elems.length; i++) {

for (var i = 0; i < elems.length; i++) {
var element = elems[i];

if (this.readOnly) {
element.hide();
} else {
Expand All @@ -54,9 +59,11 @@ define([
}

var elems = this.parent.getElementsByClassName('rule-param');
for (var i=0; i<elems.length; i++) {

for (var i = 0; i < elems.length; i++) {
var container = elems[i];
var label = Element.down(container, '.label');

if (label) {
if (this.readOnly) {
label.addClassName('label-disabled');
Expand All @@ -70,23 +77,28 @@ define([
initParam: function (container) {
container.rulesObject = this;
var label = Element.down(container, '.label');

if (label) {
Event.observe(label, 'click', this.showParamInputField.bind(this, container));
}

var elem = Element.down(container, '.element');

if (elem) {
var trig = elem.down('.rule-chooser-trigger');

if (trig) {
Event.observe(trig, 'click', this.toggleChooser.bind(this, container));
}

var apply = elem.down('.rule-param-apply');

if (apply) {
Event.observe(apply, 'click', this.hideParamInputField.bind(this, container));
} else {
elem = elem.down('.element-value-changer');
elem.container = container;

if (!elem.multiple) {
Event.observe(elem, 'change', this.hideParamInputField.bind(this, container));
}
Expand All @@ -95,28 +107,35 @@ define([
}

var remove = Element.down(container, '.rule-param-remove');

if (remove) {
Event.observe(remove, 'click', this.removeRuleEntry.bind(this, container));
}
},

showChooserElement: function (chooser) {
this.chooserSelectedItems = $H({});

if (chooser.hasClassName('no-split')) {
this.chooserSelectedItems.set(this.updateElement.value, 1);
} else {
var values = this.updateElement.value.split(','), s = '';
for (i=0; i<values.length; i++) {
var values = this.updateElement.value.split(','),
s = '';

for (i = 0; i < values.length; i++) {
s = values[i].strip();
if (s!='') {
this.chooserSelectedItems.set(s,1);

if (s != '') {
this.chooserSelectedItems.set(s, 1);
}
}
}
new Ajax.Request(chooser.getAttribute('url'), {
evalScripts: true,
parameters: {'form_key': FORM_KEY, 'selected[]':this.chooserSelectedItems.keys() },
onSuccess: function(transport) {
parameters: {
'form_key': FORM_KEY, 'selected[]': this.chooserSelectedItems.keys()
},
onSuccess: function (transport) {
if (this._processSuccess(transport)) {
$(chooser).update(transport.responseText);
this.showChooserLoaded(chooser, transport);
Expand All @@ -127,16 +146,18 @@ define([
});
},

showChooserLoaded: function(chooser, transport) {
showChooserLoaded: function (chooser, transport) {
chooser.style.display = 'block';
},

showChooser: function (container, event) {
var chooser = container.up('li');

if (!chooser) {
return;
}
chooser = chooser.down('.rule-chooser');

if (!chooser) {
return;
}
Expand All @@ -145,10 +166,12 @@ define([

hideChooser: function (container, event) {
var chooser = container.up('li');

if (!chooser) {
return;
}
chooser = chooser.down('.rule-chooser');

if (!chooser) {
return;
}
Expand All @@ -161,10 +184,12 @@ define([
}

var chooser = container.up('li').down('.rule-chooser');

if (!chooser) {
return;
}
if (chooser.style.display=='block') {

if (chooser.style.display == 'block') {
chooser.style.display = 'none';
this.cleanChooser(container, event);
} else {
Expand All @@ -174,6 +199,7 @@ define([

cleanChooser: function (container, event) {
var chooser = container.up('li').down('.rule-chooser');

if (!chooser) {
return;
}
Expand All @@ -193,53 +219,64 @@ define([
var elemContainer = Element.down(container, '.element');

var elem = Element.down(elemContainer, 'input.input-text');

if (elem) {
elem.focus();

if (elem && elem.id && elem.id.match(/__value$/)) {
this.updateElement = elem;
}

}

var elem = Element.down(elemContainer, '.element-value-changer');

if (elem) {
elem.focus();
elem.focus();
}

this.shownElement = container;
},

hideParamInputField: function (container, event) {
Element.removeClassName(container, 'rule-param-edit');
var label = Element.down(container, '.label'), elem;
var label = Element.down(container, '.label'),
elem;

if (!container.hasClassName('rule-param-new-child')) {
elem = Element.down(container, '.element-value-changer');

if (elem && elem.options) {
var selectedOptions = [];
for (i=0; i<elem.options.length; i++) {

for (i = 0; i < elem.options.length; i++) {
if (elem.options[i].selected) {
selectedOptions.push(elem.options[i].text);
}
}

var str = selectedOptions.join(', ');
label.innerHTML = str!='' ? str : '...';

label.innerHTML = str != '' ? str : '...';
}

elem = Element.down(container, 'input.input-text');

if (elem) {
var str = elem.value.replace(/(^\s+|\s+$)/g, '');

elem.value = str;
if (str=='') {

if (str == '') {
str = '...';
} else if (str.length>30) {
str = str.substr(0, 30)+'...';
} else if (str.length > 30) {
str = str.substr(0, 30) + '...';
}
label.innerHTML = str.escapeHTML();
}
} else {
elem = container.down('.element-value-changer');

if (elem.value) {
this.addRuleNewChild(elem);
}
Expand All @@ -258,10 +295,12 @@ define([
var parent_id = elem.id.replace(/^.*__(.*)__.*$/, '$1');
var children_ul_id = elem.id.replace(/__/g, ':').replace(/[^:]*$/, 'children').replace(/:/g, '__');
var children_ul = $(this.parent).select('#' + children_ul_id)[0];
var max_id = 0, i;
var max_id = 0,
i;
var children_inputs = Selector.findChildElements(children_ul, $A(['input.hidden']));

if (children_inputs.length) {
children_inputs.each(function(el){
children_inputs.each(function (el) {
if (el.id.match(/__type$/)) {
i = 1 * el.id.replace(/^.*__.*?([0-9]+)__.*$/, '$1');
max_id = i > max_id ? i : max_id;
Expand All @@ -271,38 +310,45 @@ define([
var new_id = parent_id + '--' + (max_id + 1);
var new_type = elem.value;
var new_elem = document.createElement('LI');

new_elem.className = 'rule-param-wait';
new_elem.innerHTML = jQuery.mage.__('This won\'t take long . . .');
children_ul.insertBefore(new_elem, $(elem).up('li'));

new Ajax.Request(this.newChildUrl, {
evalScripts: true,
parameters: {form_key: FORM_KEY, type:new_type.replace('/','-'), id:new_id },
parameters: {
form_key: FORM_KEY, type: new_type.replace('/', '-'), id: new_id
},
onComplete: this.onAddNewChildComplete.bind(this, new_elem),
onSuccess: function(transport) {
if(this._processSuccess(transport)) {
onSuccess: function (transport) {
if (this._processSuccess(transport)) {
$(new_elem).update(transport.responseText);
}
}.bind(this),
onFailure: this._processFailure.bind(this)
});
},

_processSuccess : function(transport) {
_processSuccess: function (transport) {
if (transport.responseText.isJSON()) {
var response = transport.responseText.evalJSON()
var response = transport.responseText.evalJSON();

if (response.error) {
alert(response.message);
}
if(response.ajaxExpired && response.ajaxRedirect) {

if (response.ajaxExpired && response.ajaxRedirect) {
setLocation(response.ajaxRedirect);
}

return false;
}

return true;
},

_processFailure : function(transport) {
_processFailure: function (transport) {
location.href = BASE_URL;
},

Expand All @@ -313,13 +359,15 @@ define([

$(new_elem).removeClassName('rule-param-wait');
var elems = new_elem.getElementsByClassName('rule-param');
for (var i=0; i<elems.length; i++) {

for (var i = 0; i < elems.length; i++) {
this.initParam(elems[i]);
}
},

removeRuleEntry: function (container, event) {
var li = Element.up(container, 'li');

li.parentNode.removeChild(li);
},

Expand All @@ -329,17 +377,22 @@ define([

chooserGridRowInit: function (grid, row) {
if (!grid.reloadParams) {
grid.reloadParams = {'selected[]':this.chooserSelectedItems.keys()};
grid.reloadParams = {
'selected[]': this.chooserSelectedItems.keys()
};
}
},

chooserGridRowClick: function (grid, event) {
var trElement = Event.findElement(event, 'tr');
var isInput = Event.element(event).tagName == 'INPUT';

if (trElement) {
var checkbox = Element.select(trElement, 'input');

if (checkbox[0]) {
var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;

grid.setCheckboxChecked(checkbox[0], checked);

}
Expand All @@ -349,12 +402,14 @@ define([
chooserGridCheckboxCheck: function (grid, element, checked) {
if (checked) {
if (!element.up('th')) {
this.chooserSelectedItems.set(element.value,1);
this.chooserSelectedItems.set(element.value, 1);
}
} else {
this.chooserSelectedItems.unset(element.value);
}
grid.reloadParams = {'selected[]':this.chooserSelectedItems.keys()};
grid.reloadParams = {
'selected[]': this.chooserSelectedItems.keys()
};
this.updateElement.value = this.chooserSelectedItems.keys().join(', ');
}
};
Expand Down
Loading