Skip to content

Commit bf4e733

Browse files
guz-antonguz-anton
committed
Merge pull request #219 from magento-vanilla/MAGETWO-44467
[Vanilla] Tasks
2 parents 6969b54 + 4e447c1 commit bf4e733

File tree

145 files changed

+3116
-3070
lines changed

Some content is hidden

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

145 files changed

+3116
-3070
lines changed

‎app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml

Lines changed: 8 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -21,59 +21,28 @@
2121
<argument name="requestFieldName" xsi:type="string">id</argument>
2222
<argument name="data" xsi:type="array">
2323
<item name="config" xsi:type="array">
24+
<item name="component" xsi:type="string">Magento_Ui/js/grid/provider</item>
2425
<item name="update_url" xsi:type="url" path="mui/index/render"/>
2526
</item>
2627
</argument>
2728
</argument>
28-
<argument name="data" xsi:type="array">
29-
<item name="js_config" xsi:type="array">
30-
<item name="component" xsi:type="string">Magento_Ui/js/grid/provider</item>
31-
</item>
32-
</argument>
3329
</dataSource>
34-
<container name="listing_top">
30+
<listingToolbar name="listing_top">
3531
<argument name="data" xsi:type="array">
3632
<item name="config" xsi:type="array">
37-
<item name="template" xsi:type="string">ui/grid/toolbar</item>
33+
<item name="sticky" xsi:type="boolean">true</item>
3834
</item>
3935
</argument>
40-
<bookmark name="bookmarks">
41-
<argument name="data" xsi:type="array">
42-
<item name="config" xsi:type="array">
43-
<item name="storageConfig" xsi:type="array">
44-
<item name="namespace" xsi:type="string">product_listing</item>
45-
</item>
46-
</item>
47-
</argument>
48-
</bookmark>
49-
<component name="columns_controls">
50-
<argument name="data" xsi:type="array">
51-
<item name="config" xsi:type="array">
52-
<item name="component" xsi:type="string">Magento_Ui/js/grid/controls/columns</item>
53-
<item name="displayArea" xsi:type="string">dataGridActions</item>
54-
<item name="columnsData" xsi:type="array">
55-
<item name="provider" xsi:type="string">product_listing.product_listing.product_columns</item>
56-
</item>
57-
</item>
58-
</argument>
59-
</component>
36+
<bookmark name="bookmarks"/>
37+
<columnsControls name="columns_controls"/>
6038
<filters name="listing_filters">
61-
<argument name="data" xsi:type="array">
62-
<item name="config" xsi:type="array">
63-
<item name="columnsProvider" xsi:type="string">product_listing.product_listing.product_columns</item>
64-
<item name="storageConfig" xsi:type="array">
65-
<item name="provider" xsi:type="string">product_listing.product_listing.listing_top.bookmarks</item>
66-
<item name="namespace" xsi:type="string">current.filters</item>
67-
</item>
68-
</item>
69-
</argument>
7039
<filterSelect name="store_id">
7140
<argument name="optionsProvider" xsi:type="configurableObject">
7241
<argument name="class" xsi:type="string">Magento\Store\Ui\Component\Listing\Column\Store\Options</argument>
7342
</argument>
7443
<argument name="data" xsi:type="array">
7544
<item name="config" xsi:type="array">
76-
<item name="provider" xsi:type="string">product_listing.product_listing.listing_top.listing_filters</item>
45+
<item name="provider" xsi:type="string">${ $.parentName }</item>
7746
<item name="dataScope" xsi:type="string">store_id</item>
7847
<item name="caption" xsi:type="string" translate="true">All Store Views</item>
7948
<item name="label" xsi:type="string" translate="true">Store View</item>
@@ -84,9 +53,7 @@
8453
<massaction name="listing_massaction">
8554
<argument name="data" xsi:type="array">
8655
<item name="config" xsi:type="array">
87-
<item name="selectProvider" xsi:type="string">product_listing.product_listing.product_columns.ids</item>
8856
<item name="component" xsi:type="string">Magento_Ui/js/grid/tree-massactions</item>
89-
<item name="indexField" xsi:type="string">entity_id</item>
9057
</item>
9158
</argument>
9259
<action name="delete">
@@ -136,25 +103,11 @@
136103
</argument>
137104
</action>
138105
</massaction>
139-
<paging name="listing_paging">
140-
<argument name="data" xsi:type="array">
141-
<item name="config" xsi:type="array">
142-
<item name="selectProvider" xsi:type="string">product_listing.product_listing.product_columns.ids</item>
143-
<item name="storageConfig" xsi:type="array">
144-
<item name="provider" xsi:type="string">product_listing.product_listing.listing_top.bookmarks</item>
145-
<item name="namespace" xsi:type="string">current.paging</item>
146-
</item>
147-
</item>
148-
</argument>
149-
</paging>
150-
</container>
106+
<paging name="listing_paging"/>
107+
</listingToolbar>
151108
<columns name="product_columns" class="Magento\Catalog\Ui\Component\Listing\Columns">
152109
<argument name="data" xsi:type="array">
153110
<item name="config" xsi:type="array">
154-
<item name="storageConfig" xsi:type="array">
155-
<item name="provider" xsi:type="string">product_listing.product_listing.listing_top.bookmarks</item>
156-
<item name="namespace" xsi:type="string">current</item>
157-
</item>
158111
<item name="childDefaults" xsi:type="array">
159112
<item name="fieldAction" xsi:type="array">
160113
<item name="provider" xsi:type="string">product_listing.product_listing.product_columns.actions</item>
@@ -164,11 +117,6 @@
164117
<item name="1" xsi:type="string">${ $.$data.rowIndex }</item>
165118
</item>
166119
</item>
167-
<item name="storageConfig" xsi:type="array">
168-
<item name="provider" xsi:type="string">product_listing.product_listing.listing_top.bookmarks</item>
169-
<item name="root" xsi:type="string">columns.${ $.index }</item>
170-
<item name="namespace" xsi:type="string">current.${ $.storageConfig.root}</item>
171-
</item>
172120
</item>
173121
</item>
174122
</argument>

‎app/code/Magento/Checkout/view/frontend/requirejs-config.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,5 @@ var config = {
1414
checkoutData: 'Magento_Checkout/js/checkout-data',
1515
proceedToCheckout: 'Magento_Checkout/js/proceed-to-checkout'
1616
}
17-
},
18-
deps: [
19-
"Magento_Checkout/js/checkout-loader"
20-
]
17+
}
2118
};

‎app/code/Magento/Checkout/view/frontend/templates/onepage.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// @codingStandardsIgnoreFile
88
?>
99
<div id="checkout" data-bind="scope:'checkout'" class="checkout-container">
10-
<div id="checkout-loader" data-role="checkout-loader" class="loading-mask">
10+
<div id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"checkoutLoader": {}}'>
1111
<div class="loader">
1212
<img src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/loader-1.gif'); ?>"
1313
alt="<?php /* @escapeNotVerified */ echo __('Loading...'); ?>"

‎app/code/Magento/Checkout/view/frontend/web/js/checkout-loader.js

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,29 @@
22
* Copyright © 2015 Magento. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5-
/*jslint browser: true*/
6-
(function () {
5+
define([
6+
'rjsResolver'
7+
], function (resolver) {
78
'use strict';
89

9-
var checkInterval;
10+
/**
11+
* Removes provided loader element from DOM.
12+
*
13+
* @param {HTMLElement} $loader - Loader DOM element.
14+
*/
15+
function hideLoader($loader) {
16+
$loader.parentNode.removeChild($loader);
17+
}
1018

11-
checkInterval = setInterval(function () {
12-
var checkoutContainer = document.getElementById('checkoutSteps'),
13-
steps,
14-
loaderContainer;
19+
/**
20+
* Initializes assets loading process listener.
21+
*
22+
* @param {Object} config - Optional configuration
23+
* @param {HTMLElement} $loader - Loader DOM element.
24+
*/
25+
function init(config, $loader) {
26+
resolver(hideLoader.bind(null, $loader));
27+
}
1528

16-
//Return if checkout steps container not loaded
17-
if (!checkoutContainer) {
18-
return;
19-
}
20-
21-
//Checkout steps
22-
steps = checkoutContainer.getElementsByTagName('li');
23-
24-
//Remove loader and clear update interval if content loaded
25-
if (steps && steps.length > 0) {
26-
clearInterval(checkInterval);
27-
loaderContainer = document.getElementById('checkout-loader');
28-
29-
if (loaderContainer && loaderContainer.parentNode) {
30-
loaderContainer.parentNode.removeChild(loaderContainer);
31-
}
32-
}
33-
34-
}, 100);
35-
})();
29+
return init;
30+
});

‎app/code/Magento/Checkout/view/frontend/web/js/model/full-screen-loader.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
*/
55
/*jshint browser:true jquery:true*/
66
/*global alert*/
7-
define(
8-
['jquery'],
9-
function ($) {
7+
define([
8+
'jquery',
9+
'rjsResolver'
10+
], function ($, resolver) {
1011
'use strict';
1112

1213
var containerId = '#checkout';
@@ -22,9 +23,14 @@ define(
2223

2324
/**
2425
* Stop full page loader action
26+
*
27+
* @param {Boolean} forceStop
2528
*/
26-
stopLoader: function () {
27-
$(containerId).trigger('processStop');
29+
stopLoader: function (forceStop) {
30+
var $elem = $(containerId),
31+
stop = $elem.trigger.bind($elem, 'processStop');
32+
33+
forceStop ? stop() : resolver(stop);
2834
}
2935
};
3036
}

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml

Lines changed: 15 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -29,62 +29,27 @@
2929
<argument name="requestFieldName" xsi:type="string">id</argument>
3030
<argument name="data" xsi:type="array">
3131
<item name="config" xsi:type="array">
32+
<item name="component" xsi:type="string">Magento_Ui/js/grid/provider</item>
3233
<item name="update_url" xsi:type="url" path="mui/index/render"/>
34+
<item name="storageConfig" xsi:type="array">
35+
<item name="indexField" xsi:type="string">block_id</item>
36+
</item>
3337
</item>
3438
</argument>
3539
</argument>
36-
<argument name="data" xsi:type="array">
37-
<item name="js_config" xsi:type="array">
38-
<item name="component" xsi:type="string">Magento_Ui/js/grid/provider</item>
39-
</item>
40-
</argument>
4140
</dataSource>
42-
<container name="listing_top">
41+
<listingToolbar name="listing_top">
4342
<argument name="data" xsi:type="array">
4443
<item name="config" xsi:type="array">
45-
<item name="template" xsi:type="string">ui/grid/toolbar</item>
44+
<item name="sticky" xsi:type="boolean">true</item>
4645
</item>
4746
</argument>
48-
<bookmark name="bookmarks">
49-
<argument name="data" xsi:type="array">
50-
<item name="config" xsi:type="array">
51-
<item name="storageConfig" xsi:type="array">
52-
<item name="namespace" xsi:type="string">cms_block_listing</item>
53-
</item>
54-
</item>
55-
</argument>
56-
</bookmark>
57-
<component name="columns_controls">
58-
<argument name="data" xsi:type="array">
59-
<item name="config" xsi:type="array">
60-
<item name="columnsData" xsi:type="array">
61-
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.cms_block_columns</item>
62-
</item>
63-
<item name="component" xsi:type="string">Magento_Ui/js/grid/controls/columns</item>
64-
<item name="displayArea" xsi:type="string">dataGridActions</item>
65-
</item>
66-
</argument>
67-
</component>
68-
<filterSearch name="fulltext">
69-
<argument name="data" xsi:type="array">
70-
<item name="config" xsi:type="array">
71-
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing_data_source</item>
72-
<item name="chipsProvider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.listing_filters_chips</item>
73-
<item name="storageConfig" xsi:type="array">
74-
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.bookmarks</item>
75-
<item name="namespace" xsi:type="string">current.search</item>
76-
</item>
77-
</item>
78-
</argument>
79-
</filterSearch>
47+
<bookmark name="bookmarks"/>
48+
<columnsControls name="columns_controls"/>
49+
<filterSearch name="fulltext"/>
8050
<filters name="listing_filters">
8151
<argument name="data" xsi:type="array">
8252
<item name="config" xsi:type="array">
83-
<item name="columnsProvider" xsi:type="string">cms_block_listing.cms_block_listing.cms_block_columns</item>
84-
<item name="storageConfig" xsi:type="array">
85-
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.bookmarks</item>
86-
<item name="namespace" xsi:type="string">current.filters</item>
87-
</item>
8853
<item name="templates" xsi:type="array">
8954
<item name="filters" xsi:type="array">
9055
<item name="select" xsi:type="array">
@@ -93,12 +58,6 @@
9358
</item>
9459
</item>
9560
</item>
96-
<item name="childDefaults" xsi:type="array">
97-
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.listing_filters</item>
98-
<item name="imports" xsi:type="array">
99-
<item name="visible" xsi:type="string">cms_block_listing.cms_block_listing.cms_block_columns.${ $.index }:visible</item>
100-
</item>
101-
</item>
10261
</item>
10362
</argument>
10463
<filterSelect name="store_id">
@@ -107,6 +66,10 @@
10766
</argument>
10867
<argument name="data" xsi:type="array">
10968
<item name="config" xsi:type="array">
69+
<item name="provider" xsi:type="string">${ $.parentName }</item>
70+
<item name="imports" xsi:type="array">
71+
<item name="visible" xsi:type="string">componentType = column, index = ${ $.index }:visible</item>
72+
</item>
11073
<item name="dataScope" xsi:type="string">store_id</item>
11174
<item name="label" xsi:type="string" translate="true">Store View</item>
11275
<item name="captionValue" xsi:type="string">0</item>
@@ -115,12 +78,6 @@
11578
</filterSelect>
11679
</filters>
11780
<massaction name="listing_massaction">
118-
<argument name="data" xsi:type="array">
119-
<item name="config" xsi:type="array">
120-
<item name="selectProvider" xsi:type="string">cms_block_listing.cms_block_listing.cms_block_columns.ids</item>
121-
<item name="indexField" xsi:type="string">block_id</item>
122-
</item>
123-
</argument>
12481
<action name="delete">
12582
<argument name="data" xsi:type="array">
12683
<item name="config" xsi:type="array">
@@ -147,25 +104,11 @@
147104
</argument>
148105
</action>
149106
</massaction>
150-
<paging name="listing_paging">
151-
<argument name="data" xsi:type="array">
152-
<item name="config" xsi:type="array">
153-
<item name="storageConfig" xsi:type="array">
154-
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.bookmarks</item>
155-
<item name="namespace" xsi:type="string">current.paging</item>
156-
</item>
157-
<item name="selectProvider" xsi:type="string">cms_block_listing.cms_block_listing.cms_block_columns.ids</item>
158-
</item>
159-
</argument>
160-
</paging>
161-
</container>
107+
<paging name="listing_paging"/>
108+
</listingToolbar>
162109
<columns name="cms_block_columns">
163110
<argument name="data" xsi:type="array">
164111
<item name="config" xsi:type="array">
165-
<item name="storageConfig" xsi:type="array">
166-
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.bookmarks</item>
167-
<item name="namespace" xsi:type="string">current</item>
168-
</item>
169112
<item name="editorConfig" xsi:type="array">
170113
<item name="selectProvider" xsi:type="string">cms_block_listing.cms_block_listing.cms_block_columns.ids</item>
171114
<item name="enabled" xsi:type="boolean">true</item>
@@ -184,11 +127,6 @@
184127
<item name="1" xsi:type="boolean">true</item>
185128
</item>
186129
</item>
187-
<item name="storageConfig" xsi:type="array">
188-
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.bookmarks</item>
189-
<item name="root" xsi:type="string">columns.${ $.index }</item>
190-
<item name="namespace" xsi:type="string">current.${ $.storageConfig.root }</item>
191-
</item>
192130
</item>
193131
</item>
194132
</argument>

0 commit comments

Comments
 (0)