Skip to content

Commit c8854d9

Browse files
guz-antonguz-anton
committed
Merge branch 'MAGETWO-31191' of https://github.corp.ebay.com/magento-vanilla/magento2ce into MAGETWO-31191
2 parents 487104f + 3ccce42 commit c8854d9

File tree

111 files changed

+1049
-941
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1049
-941
lines changed

‎CHANGELOG.md

Lines changed: 139 additions & 89 deletions
Large diffs are not rendered by default.

‎Gruntfile.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ module.exports = function (grunt) {
1111
// Require
1212
// --------------------------------------
1313

14+
require('./dev/tools/grunt/tasks/mage-minify')(grunt);
15+
1416
// Time how long tasks take. Can help when optimizing build times
1517
require('time-grunt')(grunt);
1618

@@ -136,13 +138,15 @@ module.exports = function (grunt) {
136138
}
137139
},
138140

139-
uglify: {
141+
'mage-minify': {
140142
legacy: {
141143
options: {
142-
mangle: false
144+
type: 'yui-js',
145+
tempPath: 'var/cache/'
143146
},
144147
files: {
145148
'<%= config.path.uglify.legacy %>': [
149+
'lib/web/prototype/prototype.js',
146150
'lib/web/prototype/window.js',
147151
'lib/web/scriptaculous/builder.js',
148152
'lib/web/scriptaculous/effects.js',
@@ -162,7 +166,7 @@ module.exports = function (grunt) {
162166
* Mostly prototype dependant libraries.
163167
*/
164168
grunt.registerTask('legacy-build', [
165-
'uglify:legacy'
169+
'mage-minify:legacy'
166170
]);
167171

168172
// Default task

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-core": "0.42.0-beta3",
8-
"magento/module-backend": "0.42.0-beta3",
9-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-core": "0.42.0-beta4",
8+
"magento/module-backend": "0.42.0-beta4",
9+
"magento/framework": "0.42.0-beta4",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta3",
14+
"version": "0.42.0-beta4",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta3",
7-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-backend": "0.42.0-beta4",
7+
"magento/framework": "0.42.0-beta4",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta3",
11+
"version": "0.42.0-beta4",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-directory": "0.42.0-beta3",
8-
"magento/module-core": "0.42.0-beta3",
9-
"magento/module-eav": "0.42.0-beta3",
10-
"magento/module-cron": "0.42.0-beta3",
11-
"magento/module-theme": "0.42.0-beta3",
12-
"magento/module-reports": "0.42.0-beta3",
13-
"magento/module-sales": "0.42.0-beta3",
14-
"magento/module-quote": "0.42.0-beta3",
15-
"magento/module-catalog": "0.42.0-beta3",
16-
"magento/module-user": "0.42.0-beta3",
17-
"magento/module-backup": "0.42.0-beta3",
18-
"magento/module-email": "0.42.0-beta3",
19-
"magento/module-customer": "0.42.0-beta3",
20-
"magento/module-translation": "0.42.0-beta3",
21-
"magento/module-require-js": "0.42.0-beta3",
22-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-directory": "0.42.0-beta4",
8+
"magento/module-core": "0.42.0-beta4",
9+
"magento/module-eav": "0.42.0-beta4",
10+
"magento/module-cron": "0.42.0-beta4",
11+
"magento/module-theme": "0.42.0-beta4",
12+
"magento/module-reports": "0.42.0-beta4",
13+
"magento/module-sales": "0.42.0-beta4",
14+
"magento/module-quote": "0.42.0-beta4",
15+
"magento/module-catalog": "0.42.0-beta4",
16+
"magento/module-user": "0.42.0-beta4",
17+
"magento/module-backup": "0.42.0-beta4",
18+
"magento/module-email": "0.42.0-beta4",
19+
"magento/module-customer": "0.42.0-beta4",
20+
"magento/module-translation": "0.42.0-beta4",
21+
"magento/module-require-js": "0.42.0-beta4",
22+
"magento/framework": "0.42.0-beta4",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.42.0-beta3",
26+
"version": "0.42.0-beta4",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backend/view/adminhtml/layout/default.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<head>
1010
<title>Magento Admin</title>
11-
<link src="prototype/prototype.js"/>
1211
<link src="legacy-build.min.js"/>
1312
<link src="requirejs/require.js"/>
14-
<link src="mage/requirejs/resolver.js"/>
1513
<link src="jquery.js"/>
1614
<css src="mage/calendar.css"/>
1715
<css src="extjs/resources/css/ext-all.css"/>

‎app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
<?php echo $this->getLocaleSelect(); ?>
1111
</div>
1212
<script>
13-
require([
14-
'prototype'
15-
], function () {
16-
function setInterfaceLanguage(event) {
17-
var elem = Event.element(event);
18-
if (elem) {
19-
window.location.href = '<?php echo $this->getChangeLocaleUrl() ?>locale/' + elem.value + '/<?php echo $this->getUrlForReferer() ?>';
20-
}
13+
(function () {
14+
'use strict';
15+
16+
var elem = document.getElementById('footer_interface_locale');
17+
18+
function onChange() {
19+
window.location.href = '<?php echo $this->getChangeLocaleUrl() ?>locale/' + elem.value + '/<?php echo $this->getUrlForReferer() ?>';
2120
}
22-
Event.observe('footer_interface_locale', 'change', setInterfaceLanguage);
23-
});
21+
22+
elem.addEventListener('change', onChange);
23+
})();
2424
</script>
2525
</div>

‎app/code/Magento/Backend/view/adminhtml/web/js/bootstrap/editor.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
*/
66
require([
77
"Magento_Backend/variables",
8-
"mage/adminhtml/browser",
9-
"mage/adminhtml/wysiwyg/widget"
8+
"mage/adminhtml/browser"
109
]);

‎app/code/Magento/Backup/composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-core": "0.42.0-beta3",
8-
"magento/module-backend": "0.42.0-beta3",
9-
"magento/module-cron": "0.42.0-beta3",
10-
"magento/framework": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-core": "0.42.0-beta4",
8+
"magento/module-backend": "0.42.0-beta4",
9+
"magento/module-cron": "0.42.0-beta4",
10+
"magento/framework": "0.42.0-beta4",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta3",
14+
"version": "0.42.0-beta4",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Bundle/composer.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta3",
7-
"magento/module-catalog": "0.42.0-beta3",
8-
"magento/module-tax": "0.42.0-beta3",
9-
"magento/module-core": "0.42.0-beta3",
10-
"magento/module-backend": "0.42.0-beta3",
11-
"magento/module-sales": "0.42.0-beta3",
12-
"magento/module-checkout": "0.42.0-beta3",
13-
"magento/module-catalog-inventory": "0.42.0-beta3",
14-
"magento/module-customer": "0.42.0-beta3",
15-
"magento/module-catalog-rule": "0.42.0-beta3",
16-
"magento/module-eav": "0.42.0-beta3",
17-
"magento/module-gift-message": "0.42.0-beta3",
18-
"magento/framework": "0.42.0-beta3",
19-
"magento/module-webapi": "0.42.0-beta3",
20-
"magento/module-quote": "0.42.0-beta3",
6+
"magento/module-store": "0.42.0-beta4",
7+
"magento/module-catalog": "0.42.0-beta4",
8+
"magento/module-tax": "0.42.0-beta4",
9+
"magento/module-core": "0.42.0-beta4",
10+
"magento/module-backend": "0.42.0-beta4",
11+
"magento/module-sales": "0.42.0-beta4",
12+
"magento/module-checkout": "0.42.0-beta4",
13+
"magento/module-catalog-inventory": "0.42.0-beta4",
14+
"magento/module-customer": "0.42.0-beta4",
15+
"magento/module-catalog-rule": "0.42.0-beta4",
16+
"magento/module-eav": "0.42.0-beta4",
17+
"magento/module-gift-message": "0.42.0-beta4",
18+
"magento/framework": "0.42.0-beta4",
19+
"magento/module-webapi": "0.42.0-beta4",
20+
"magento/module-quote": "0.42.0-beta4",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"type": "magento2-module",
24-
"version": "0.42.0-beta3",
24+
"version": "0.42.0-beta4",
2525
"license": [
2626
"OSL-3.0",
2727
"AFL-3.0"

0 commit comments

Comments
 (0)