Skip to content

Commit df2f289

Browse files
committed
Merge branch '2.2-develop' into MAGETWO-70540
2 parents 1c51421 + c8c6aaf commit df2f289

File tree

60 files changed

+127
-607
lines changed

Some content is hidden

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

60 files changed

+127
-607
lines changed

app/code/Magento/Bundle/view/adminhtml/web/js/bundle-type-handler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5-
/*jshint browser:true jquery:true expr:true*/
5+
66
define([
77
'jquery',
88
'Magento_Catalog/catalog/type-events',

app/code/Magento/Bundle/view/frontend/web/js/float.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
/**
77
* @api
8+
* @deprecated since version 2.2.0
89
*/
910
define([
1011
'jquery',

app/code/Magento/Captcha/view/frontend/web/onepage.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @deprecated since version 2.2.0
8+
*/
69
define(['jquery'], function ($) {
710
'use strict';
811

app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
/**
67
* Create/edit some category
8+
* @deprecated since version 2.2.0
79
*/
810

911
/* global tree */

app/code/Magento/Catalog/view/adminhtml/web/js/bundle-proxy-button.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
/**
77
* @api
8+
* @deprecated since version 2.2.0
89
*/
910
define([
1011
'Magento_Ui/js/form/components/button',

app/code/Magento/Catalog/view/adminhtml/web/js/components/checkbox.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
/* Copyright © Magento, Inc. All rights reserved.
2-
* See COPYING.txt for license details.
3-
*/
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
45

6+
/**
7+
* @deprecated since version 2.2.0
8+
*/
59
define([
610
'Magento_Ui/js/form/element/abstract',
711
'knockout'

app/code/Magento/Catalog/view/adminhtml/web/js/components/input-handle-required.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @deprecated since version 2.2.0
8+
*/
69
define([
710
'Magento_Ui/js/form/element/abstract'
811
], function (Abstract) {

app/code/Magento/Catalog/view/adminhtml/web/js/components/multiselect-handle-required.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @deprecated since version 2.2.0
8+
*/
69
define([
710
'Magento_Ui/js/form/element/multiselect'
811
], function (Multiselect) {

app/code/Magento/Catalog/view/adminhtml/web/js/components/product-status.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @deprecated since version 2.2.0
8+
*/
69
define([
710
'Magento_Ui/js/form/element/abstract',
811
'underscore'

app/code/Magento/Catalog/view/adminhtml/web/js/components/select-handle-required.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @deprecated since version 2.2.0
8+
*/
69
define([
710
'Magento_Ui/js/form/element/select'
811
], function (Select) {

0 commit comments

Comments
 (0)