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

#13685: Upgrading jQuery to 3.3.1 #15531

Closed
wants to merge 17 commits into from
Closed

#13685: Upgrading jQuery to 3.3.1 #15531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
bcdff33
#13685:
kirmorozov Apr 5, 2018
ccfdcbb
#13685:
kirmorozov Apr 5, 2018
f9069b9
#13685:
kirmorozov Apr 5, 2018
c4c93aa
#13685:
kirmorozov Apr 5, 2018
4c7df0a
#13685:
kirmorozov Apr 5, 2018
39d3b3a
#13685:
kirmorozov Apr 5, 2018
9d0837a
#13685:
kirmorozov Apr 5, 2018
77bdcdb
#13685:
kirmorozov Apr 5, 2018
fb1be21
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-jq…
kirmorozov May 13, 2018
d8b9513
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-jq…
kirmorozov May 22, 2018
a9d4485
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-jq…
kirmorozov May 26, 2018
d573eb4
#13685: updated compatibility with jQueryUI 1.12, copied over tabIf g…
kirmorozov May 26, 2018
a9585e3
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-jq…
kirmorozov Jul 13, 2018
bbfba40
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-jq…
kirmorozov Aug 22, 2018
9e7c810
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-jq…
kirmorozov Nov 26, 2018
430ccdc
#13685: Returned jquery Mobile 1.5.0-alpha.1
kirmorozov Nov 28, 2018
5cd75c6
Merge branch '2.3-develop' of github.com:magento/magento2 into 2.3-de…
sivaschenko Jan 14, 2019
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
2 changes: 1 addition & 1 deletion app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ define([
}).css('display', 'none');
fu.parent().append(tmpInput);
fileUploader = $(tmpInput).fileupload();
fileUploader.fileupload('send', data).success(function (result, textStatus, jqXHR) {
fileUploader.fileupload('send', data).done(function (result, textStatus, jqXHR) {
tmpInput.remove();
callback.call(null, result, textStatus, jqXHR);
});
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Theme/view/adminhtml/requirejs-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ var config = {
'mage/adminhtml/globals'
],
'paths': {
'jquery/ui': 'jquery/jquery-ui-1.9.2'
'jquery/ui': 'jquery/jquery-ui'
}
};
2 changes: 1 addition & 1 deletion app/code/Magento/User/view/adminhtml/web/app-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require.config({
}
},
'paths': {
'jquery/ui': 'jquery/jquery-ui-1.9.2',
'jquery/ui': 'jquery/jquery-ui',
'jquery/validate': 'jquery/jquery.validate',
'jquery/hover-intent': 'jquery/jquery.hoverIntent',
'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-fp',
Expand Down
Loading