Skip to content

Commit 58e4a0c

Browse files
slopukhovslopukhov
committed
Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-62334
2 parents 943a37e + cb93edb commit 58e4a0c

File tree

461 files changed

+20671
-15263
lines changed

Some content is hidden

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

461 files changed

+20671
-15263
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Use the following table to verify you have the correct prerequisites to install
3333
<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/apache.html">Apache</a></td>
3434
</tr>
3535
<tr>
36-
<td>PHP 5.6.x, 7.0.2 or 7.0.6</td>
36+
<td>PHP 5.6.x, 7.0.2, 7.0.4 or 7.0.6</td>
3737
<td><code>php -v</code></td>
3838
<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
3939
</tr>

‎app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
define([
67
'jquery',
78
'mage/template',
@@ -15,20 +16,22 @@ define([
1516
modalClass: 'modal-system-messages',
1617
systemMessageTemplate:
1718
'<% _.each(data.items, function(item) { %>' +
18-
'<li class="message message-warning <% if (item.severity == 1) { %>error<% } else { %>warning<% } %>">' +
19+
'<li class="message message-warning' +
20+
'<% if (item.severity == 1) { %>error<% } else { %>warning<% } %>">' +
1921
'<%= item.text %>' +
2022
'</li>' +
2123
'<% }); %>'
2224
},
2325

24-
_create: function() {
26+
/** @inheritdoc */
27+
_create: function () {
2528
this.options.title = $('#message-system-all').attr('title');
2629
this._super();
2730
},
2831

32+
/** @inheritdoc */
2933
openModal: function (severity) {
3034
var superMethod = $.proxy(this._super, this);
31-
//this.modal.options
3235

3336
$.ajax({
3437
url: this.options.ajaxUrl,
@@ -56,6 +59,8 @@ define([
5659

5760
return this;
5861
},
62+
63+
/** @inheritdoc */
5964
closeModal: function () {
6065
this._super();
6166
}

‎app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,22 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
define([
6-
"jquery",
7-
"jquery/ui",
8-
"domReady!"
7+
'jquery',
8+
'jquery/ui',
9+
'domReady!'
910
], function ($) {
1011
'use strict';
1112

12-
// Mark notification as read via AJAX call
13+
/**
14+
* Mark notification as read via AJAX call.
15+
*
16+
* @param {String} notificationId
17+
*/
1318
var markNotificationAsRead = function (notificationId) {
1419
var requestUrl = $('.notifications-wrapper .admin__action-dropdown-menu').attr('data-mark-as-read-url');
20+
1521
$.ajax({
1622
url: requestUrl,
1723
type: 'POST',
@@ -22,19 +28,24 @@ define([
2228
showLoader: false
2329
});
2430
},
25-
2631
notificationCount = $('.notifications-wrapper').attr('data-notification-count'),
2732

28-
// Remove notification from the list
33+
/**
34+
* Remove notification from the list.
35+
*
36+
* @param {jQuery} notificationEntry
37+
*/
2938
removeNotificationFromList = function (notificationEntry) {
39+
var notificationIcon, actionElement;
40+
3041
notificationEntry.remove();
3142
notificationCount--;
3243
$('.notifications-wrapper').attr('data-notification-count', notificationCount);
3344

34-
if (notificationCount == 0) {
45+
if (notificationCount == 0) {// eslint-disable-line eqeqeq
3546
// Change appearance of the bubble and its behavior when the last notification is removed
3647
$('.notifications-wrapper .admin__action-dropdown-menu').remove();
37-
var notificationIcon = $('.notifications-wrapper .notifications-icon');
48+
notificationIcon = $('.notifications-wrapper .notifications-icon');
3849
notificationIcon.removeAttr('data-toggle');
3950
notificationIcon.off('click.dropdown');
4051
$('.notifications-action .notifications-counter').text('').hide();
@@ -45,12 +56,16 @@ define([
4556
}
4657
$('.notifications-entry-last .notifications-counter').text(notificationCount);
4758
// Modify caption of the 'See All' link
48-
var actionElement = $('.notifications-wrapper .admin__action-dropdown-menu .last .action-more');
59+
actionElement = $('.notifications-wrapper .admin__action-dropdown-menu .last .action-more');
4960
actionElement.text(actionElement.text().replace(/\d+/, notificationCount));
5061
}
5162
},
5263

53-
// Show notification details
64+
/**
65+
* Show notification details.
66+
*
67+
* @param {jQuery} notificationEntry
68+
*/
5469
showNotificationDetails = function (notificationEntry) {
5570
var notificationDescription = notificationEntry.find('.notifications-entry-description'),
5671
notificationDescriptionEnd = notificationEntry.find('.notifications-entry-description-end');
@@ -59,20 +74,22 @@ define([
5974
notificationDescriptionEnd.addClass('_show');
6075
}
6176

62-
if(notificationDescription.hasClass('_cutted')) {
77+
if (notificationDescription.hasClass('_cutted')) {
6378
notificationDescription.removeClass('_cutted');
6479
}
6580
};
6681

6782
// Show notification description when corresponding item is clicked
68-
$('.notifications-wrapper .admin__action-dropdown-menu .notifications-entry').on('click.showNotification', function (event) {
69-
// hide notification dropdown
70-
$('.notifications-wrapper .notifications-icon').trigger('click.dropdown');
83+
$('.notifications-wrapper .admin__action-dropdown-menu .notifications-entry').on(
84+
'click.showNotification',
85+
function (event) {
86+
// hide notification dropdown
87+
$('.notifications-wrapper .notifications-icon').trigger('click.dropdown');
7188

72-
showNotificationDetails($(this));
73-
event.stopPropagation();
74-
75-
});
89+
showNotificationDetails($(this));
90+
event.stopPropagation();
91+
}
92+
);
7693

7794
// Remove corresponding notification from the list and mark it as read
7895
$('.notifications-close').on('click.removeNotification', function (event) {
@@ -83,19 +100,19 @@ define([
83100
removeNotificationFromList(notificationEntry);
84101

85102
// Checking for last unread notification to hide dropdown
86-
if (notificationCount == 0) {
103+
if (notificationCount == 0) {// eslint-disable-line eqeqeq
87104
$('.notifications-wrapper').removeClass('active')
88-
.find('.notifications-action').removeAttr('data-toggle')
89-
.off('click.dropdown');
105+
.find('.notifications-action')
106+
.removeAttr('data-toggle')
107+
.off('click.dropdown');
90108
}
91109
event.stopPropagation();
92110
});
93111

94112
// Hide notifications bubble
95-
if (notificationCount == 0) {
113+
if (notificationCount == 0) {// eslint-disable-line eqeqeq
96114
$('.notifications-action .notifications-counter').hide();
97115
} else {
98116
$('.notifications-action .notifications-counter').show();
99117
}
100-
101118
});

‎app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
(function (factory) {
67
if (typeof define === 'function' && define.amd) {
78
define([

‎app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/authorizenet.js

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,21 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5-
/*browser:true*/
6-
/*global define*/
7-
define(
8-
[
9-
'uiComponent',
10-
'Magento_Checkout/js/model/payment/renderer-list'
11-
],
12-
function (
13-
Component,
14-
rendererList
15-
) {
16-
'use strict';
17-
rendererList.push(
18-
{
19-
type: 'authorizenet_directpost',
20-
component: 'Magento_Authorizenet/js/view/payment/method-renderer/authorizenet-directpost'
21-
}
22-
);
23-
/** Add view logic here if needed */
24-
return Component.extend({});
25-
}
26-
);
5+
6+
define([
7+
'uiComponent',
8+
'Magento_Checkout/js/model/payment/renderer-list'
9+
],
10+
function (Component, rendererList) {
11+
'use strict';
12+
13+
rendererList.push(
14+
{
15+
type: 'authorizenet_directpost',
16+
component: 'Magento_Authorizenet/js/view/payment/method-renderer/authorizenet-directpost'
17+
}
18+
);
19+
20+
/** Add view logic here if needed */
21+
return Component.extend({});
22+
});

‎app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,63 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5-
define(
6-
[
7-
'jquery',
8-
'Magento_Payment/js/view/payment/iframe',
9-
'mage/translate'
10-
],
11-
function ($, Component, $t) {
12-
'use strict';
135

14-
return Component.extend({
15-
defaults: {
16-
template: 'Magento_Authorizenet/payment/authorizenet-directpost',
17-
timeoutMessage: $t('Sorry, but something went wrong. Please contact the seller.')
18-
},
19-
placeOrderHandler: null,
20-
validateHandler: null,
6+
define([
7+
'jquery',
8+
'Magento_Payment/js/view/payment/iframe',
9+
'mage/translate'
10+
],
11+
function ($, Component, $t) {
12+
'use strict';
2113

22-
/**
23-
* @param {Object} handler
24-
*/
25-
setPlaceOrderHandler: function (handler) {
26-
this.placeOrderHandler = handler;
27-
},
14+
return Component.extend({
15+
defaults: {
16+
template: 'Magento_Authorizenet/payment/authorizenet-directpost',
17+
timeoutMessage: $t('Sorry, but something went wrong. Please contact the seller.')
18+
},
19+
placeOrderHandler: null,
20+
validateHandler: null,
2821

29-
/**
30-
* @param {Object} handler
31-
*/
32-
setValidateHandler: function (handler) {
33-
this.validateHandler = handler;
34-
},
22+
/**
23+
* @param {Object} handler
24+
*/
25+
setPlaceOrderHandler: function (handler) {
26+
this.placeOrderHandler = handler;
27+
},
3528

36-
/**
37-
* @returns {Object}
38-
*/
39-
context: function () {
40-
return this;
41-
},
29+
/**
30+
* @param {Object} handler
31+
*/
32+
setValidateHandler: function (handler) {
33+
this.validateHandler = handler;
34+
},
4235

43-
/**
44-
* @returns {Boolean}
45-
*/
46-
isShowLegend: function () {
47-
return true;
48-
},
36+
/**
37+
* @returns {Object}
38+
*/
39+
context: function () {
40+
return this;
41+
},
4942

50-
/**
51-
* @returns {String}
52-
*/
53-
getCode: function () {
54-
return 'authorizenet_directpost';
55-
},
43+
/**
44+
* @returns {Boolean}
45+
*/
46+
isShowLegend: function () {
47+
return true;
48+
},
5649

57-
/**
58-
* @returns {Boolean}
59-
*/
60-
isActive: function () {
61-
return true;
62-
}
63-
});
64-
}
65-
);
50+
/**
51+
* @returns {String}
52+
*/
53+
getCode: function () {
54+
return 'authorizenet_directpost';
55+
},
56+
57+
/**
58+
* @returns {Boolean}
59+
*/
60+
isActive: function () {
61+
return true;
62+
}
63+
});
64+
});

‎app/code/Magento/Backend/view/adminhtml/requirejs-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5-
/*eslint no-unused-vars: 0*/
5+
66
var config = {
77
map: {
88
'*': {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
require([
7-
"Magento_Variable/variables",
8-
"mage/adminhtml/browser"
8+
'Magento_Variable/variables',
9+
'mage/adminhtml/browser'
910
]);

0 commit comments

Comments
 (0)