Skip to content

Commit 28ff7b6

Browse files
committed
Migration from extjs to jstree minor corrections
1 parent d9cdefc commit 28ff7b6

File tree

3 files changed

+5
-22
lines changed

3 files changed

+5
-22
lines changed

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dragAndDrop selector1="{{UnassignedAttributes.ProductAttributeName('$$createProductAttribute.attribute_code$$')}}" selector2="{{Group.FolderName('Product Details')}}" stepKey="moveProductAttributeToGroup"/>
4545
<click selector="{{AttributeSetSection.Save}}" stepKey="saveAttributeSet"/>
4646
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear" />
47-
<seeElement selector=".message-success" stepKey="assertSuccess"/>
47+
<waitForElementVisible selector=".message-success" stepKey="assertSuccess"/>
4848
<actionGroup ref="FillAdminSimpleProductFormActionGroup" stepKey="fillProductFieldsInAdmin">
4949
<argument name="category" value="$$createPreReqCategory$$"/>
5050
<argument name="simpleProduct" value="SimpleProduct"/>

app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
/************************************************************************
2-
*
3-
* ADOBE CONFIDENTIAL
4-
* ___________________
52
*
63
* Copyright 2018 Adobe
74
* All Rights Reserved.
@@ -14,7 +11,7 @@
1411
* Dissemination of this information or reproduction of this material
1512
* is strictly forbidden unless prior written permission is obtained
1613
* from Adobe.
17-
*************************************************************************
14+
* ***********************************************************************
1815
*/
1916

2017
define([

app/design/adminhtml/Magento/backend/web/css/source/components/_rules-temp.less

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
1-
/************************************************************************
2-
*
3-
* ADOBE CONFIDENTIAL
4-
* ___________________
5-
*
6-
* Copyright 2015 Adobe
7-
* All Rights Reserved.
8-
*
9-
* NOTICE: All information contained herein is, and remains
10-
* the property of Adobe and its suppliers, if any. The intellectual
11-
* and technical concepts contained herein are proprietary to Adobe
12-
* and its suppliers and are protected by all applicable intellectual
13-
* property laws, including trade secret and copyright laws.
14-
* Dissemination of this information or reproduction of this material
15-
* is strictly forbidden unless prior written permission is obtained
16-
* from Adobe.
17-
*************************************************************************
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
184
*/
195

206
//

0 commit comments

Comments
 (0)