Skip to content

Commit d4662b1

Browse files
authored
Merge pull request magento#33287 from mrtuvn/jquery-prepare2
Prepare for jquery new version
2 parents 58a9ca1 + cb3325b commit d4662b1

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<div class="admin__control-table-pagination" visible="!!element.getRecordCount()">
3838
<div class="admin__data-grid-pager">
3939
<button class="action-previous" type="button" data-bind="attr: {title: $t('Previous Page')}, click: previousPage, disable: isFirst()"></button>
40-
<input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage">
40+
<input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage"/>
4141
<label class="admin__control-support-text" data-bind="attr: {for: ko.uid}, text: 'of ' + pages()"></label>
4242
<button class="action-next" type="button" data-bind="attr: {title: $t('Next Page')}, click: nextPage, disable: isLast()"></button>
4343
</div>
@@ -86,7 +86,7 @@
8686
<div class="message message-notice notice">
8787
<span
8888
translate="'Search strings are either normal strings or regular expressions (PCRE). They are matched in the same order as entered.'"></span>
89-
<br>
89+
<br/>
9090
<span
9191
translate="'Examples'"></span>:
9292
<span class="code-sample">Firefox: /^mozilla/i</span>

app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ require([
3535
var uploadButton = $('#css_uploader_button');
3636
/** Unbind click event on file change */
3737
uploadButton.off('click');
38-
uploadButton.removeAttr('disabled');
38+
uploadButton.prop('disabled', false);
3939
40-
uploadButton.click(function () {
40+
uploadButton.on('click', function () {
4141
$('#messages').html('');
4242
$(this).attr('disabled', 'disabled');
4343
data.submit();

app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ require([
5757
});
5858
5959
var uploadButton = $('#js_uploader_button');
60-
uploadButton.removeAttr('disabled');
60+
uploadButton.prop('disabled', false);
6161
62-
uploadButton.click(function () {
62+
uploadButton.on('click', function () {
6363
$('#messages').html('');
6464
$(this).attr('disabled', 'disabled');
6565
@@ -121,7 +121,7 @@ require([
121121
}
122122
});
123123
124-
$('#js_files_uploader').click(function () {
124+
$('#js_files_uploader').on('click', function () {
125125
/** Unbind click event on file change */
126126
$('#js-file-uploader').html('');
127127
$('#js_uploader_button').off('click');

0 commit comments

Comments
 (0)