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

Jump to bottom

Refactor JS code and added JS component file #17527

Merged
merged 2 commits into from
Aug 14, 2018
Merged

Refactor JS code and added JS component file #17527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de0ec20
Refactor JS code and added JS component file
yogeshsuhagiya Aug 11, 2018
0c1104f
Replaced jQuery with $ alias
yogeshsuhagiya Aug 11, 2018
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
16 changes: 8 additions & 8 deletions app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<input name="form_key" type="hidden" value="<?= $block->escapeHtml($block->getFormKey()) ?>" />
<?= $block->getChildHtml('form') ?>
</form>


<script>
require(['jquery', "mage/mage"], function(jQuery){

jQuery('#edit_form').mage('form').mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});

});
<script type="text/x-magento-init">
{
'#edit_form': {
"Magento_Ui/catalog/product/edit/attribute": {
validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'
}
}
}
</script>
<?= /* @escapeNotVerified */ $block->getFormScripts() ?>
15 changes: 8 additions & 7 deletions ...code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="attributes-edit-form" class="attributes-edit-form" enctype="multipart/form-data">
<?= $block->getBlockHtml('formkey') ?>
</form>
<script>
require(['jquery', "mage/mage"], function(jQuery){

jQuery('#attributes-edit-form').mage('form')
.mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});

});
<script type="text/x-magento-init">
{
"#attributes-edit-form": {
"Magento_Ui/catalog/product/edit/attribute": {
validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'
}
}
}
</script>
18 changes: 18 additions & 0 deletions app/code/Magento/Catalog/view/adminhtml/web/catalog/product/edit/attribute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

define([
'jquery',
'mage/mage'
], function ($) {
'use strict';

return function (config, element) {

$(element).mage('form').mage('validation', {
validationUrl: config.validationUrl
});
};
});