Skip to content

Commit 02dbbce

Browse files
author
Volodymyr Zaets
committed
Merge remote-tracking branch 'origin/MAGETWO-51628' into PR
2 parents 1adf4c9 + cbaaa36 commit 02dbbce

File tree

9 files changed

+61
-20
lines changed

9 files changed

+61
-20
lines changed

‎app/code/Magento/Swatches/view/adminhtml/layout/catalog_product_attribute_edit.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<head>
1010
<css src="Magento_Swatches::css/swatches.css"/>
1111
<css src="jquery/colorpicker/css/colorpicker.css"/>
12-
<link src="jquery/colorpicker/js/colorpicker.js"/>
1312
</head>
1413
<body>
1514
<referenceContainer name="main">

‎app/code/Magento/Swatches/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<head>
1010
<css src="Magento_Swatches::css/swatches.css"/>
1111
<css src="jquery/colorpicker/css/colorpicker.css"/>
12-
<link src="jquery/colorpicker/js/colorpicker.js"/>
1312
</head>
1413
<body>
1514
<referenceContainer name="form">

‎app/code/Magento/Swatches/view/adminhtml/layout/catalog_product_form.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99
<head>
1010
<css src="Magento_Swatches::css/swatches.css"/>
1111
<css src="jquery/colorpicker/css/colorpicker.css"/>
12-
<link src="jquery/colorpicker/js/colorpicker.js"/>
1312
</head>
1413
</page>

‎app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ define([
1212
'uiRegistry',
1313
'prototype',
1414
'Magento_Ui/js/form/element/abstract',
15+
'jquery/colorpicker/js/colorpicker',
1516
'jquery/ui'
1617
], function (_, jQuery, mageTemplate, rg, prototype, Abstract) {
1718
'use strict';

‎app/code/Magento/Swatches/view/adminhtml/web/js/visual.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ define([
99
'jquery',
1010
'mage/template',
1111
'uiRegistry',
12+
'jquery/colorpicker/js/colorpicker',
1213
'prototype',
1314
'jquery/ui'
1415
], function (jQuery, mageTemplate, rg) {

‎app/design/adminhtml/Magento/backend/etc/view.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<item type="file">Lib::mage/list.js</item>
3737
<item type="file">Lib::mage/loader.js</item>
3838
<item type="file">Lib::mage/menu.js</item>
39-
<item type="file">Lib::mage/popup-window.js</item>
4039
<item type="file">Lib::mage/redirect-url.js</item>
4140
<item type="file">Lib::mage/sticky.js</item>
4241
<item type="file">Lib::mage/terms.js</item>
@@ -49,21 +48,28 @@
4948
<item type="file">Lib::mage/validation/validation.js</item>
5049
<item type="file">Lib::mage/adminhtml/varienLoader.js</item>
5150
<item type="file">Lib::mage/adminhtml/tools.js</item>
51+
<item type="file">Lib::mage/gallery/gallery.js</item>
52+
<item type="file">Lib::mage/requirejs/mixins.js</item>
53+
<item type="file">Lib::mage/requirejs/static.js</item>
5254
<item type="file">Lib::jquery/jquery.min.js</item>
5355
<item type="file">Lib::jquery/jquery.parsequery.js</item>
5456
<item type="file">Lib::jquery/jquery.mobile.custom.js</item>
5557
<item type="file">Lib::jquery/jquery-ui.js</item>
5658
<item type="file">Lib::jquery/jquery-ui.min.js</item>
5759
<item type="file">Lib::matchMedia.js</item>
5860
<item type="file">Lib::requirejs/require.js</item>
61+
<item type="file">Lib::requirejs/text.js</item>
5962
<item type="file">Lib::date-format-normalizer.js</item>
6063
<item type="file">Lib::varien/js.js</item>
6164
<item type="directory">Lib::css</item>
6265
<item type="directory">Lib::lib</item>
6366
<item type="directory">Lib::prototype</item>
6467
<item type="directory">Lib::scriptaculous</item>
68+
<item type="directory">Lib::extjs</item>
69+
<item type="directory">Lib::less</item>
70+
<item type="directory">Lib::fotorama</item>
71+
<item type="directory">Lib::magnifier</item>
6572
<item type="directory">Lib::tiny_mce</item>
66-
<item type="directory">Lib::mage/requirejs</item>
6773
<item type="directory">Lib::tiny_mce/classes</item>
6874
<item type="directory">Lib::tiny_mce/langs</item>
6975
<item type="directory">Lib::tiny_mce/plugins</item>

‎app/design/frontend/Magento/blank/etc/view.xml

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -250,21 +250,40 @@
250250
<var name="bundle_size">1MB</var>
251251
</vars>
252252
<exclude>
253+
<item type="file">Lib::jquery/jquery.min.js</item>
253254
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
254255
<item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
255256
<item type="file">Lib::jquery/jquery.details.js</item>
256257
<item type="file">Lib::jquery/jquery.details.min.js</item>
257258
<item type="file">Lib::jquery/jquery.hoverIntent.js</item>
258-
<item type="file">Lib::jquery/jquery.min.js</item>
259+
<item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
260+
<item type="file">Lib::requirejs/require.js</item>
261+
<item type="file">Lib::requirejs/text.js</item>
262+
<item type="file">Lib::date-format-normalizer.js</item>
263+
<item type="file">Lib::legacy-build.min.js</item>
259264
<item type="file">Lib::mage/captcha.js</item>
260265
<item type="file">Lib::mage/dropdown_old.js</item>
261266
<item type="file">Lib::mage/list.js</item>
262267
<item type="file">Lib::mage/loader_old.js</item>
263268
<item type="file">Lib::mage/webapi.js</item>
264-
<item type="file">Lib::moment.js</item>
265-
<item type="file">Lib::requirejs/require.js</item>
266-
<item type="file">Lib::date-format-normalizer.js</item>
267-
<item type="file">Lib::legacy-build.min.js</item>
269+
<item type="file">Lib::mage/zoom.js</item>
270+
<item type="file">Lib::mage/translate-inline-vde.js</item>
271+
<item type="file">Lib::mage/requirejs/mixins.js</item>
272+
<item type="file">Lib::mage/requirejs/static.js</item>
273+
<item type="file">Magento_Customer::js/zxcvbn.js</item>
274+
<item type="file">Magento_Catalog::js/zoom.js</item>
275+
<item type="file">Magento_Ui::js/lib/step-wizard.js</item>
276+
<item type="file">Magento_Ui::js/form/element/ui-select.js</item>
277+
<item type="file">Magento_Ui::js/form/element/file-uploader.js</item>
278+
<item type="file">Magento_Ui::js/form/components/insert.js</item>
279+
<item type="file">Magento_Ui::js/form/components/insert-listing.js</item>
280+
<item type="directory">Magento_Ui::js/timeline</item>
281+
<item type="directory">Magento_Ui::js/grid</item>
282+
<item type="directory">Magento_Ui::js/dynamic-rows</item>
283+
<item type="directory">Magento_Ui::templates/timeline</item>
284+
<item type="directory">Magento_Ui::templates/grid</item>
285+
<item type="directory">Magento_Ui::templates/dynamic-rows</item>
286+
<item type="directory">Magento_Swagger::swagger-ui</item>
268287
<item type="directory">Lib::modernizr</item>
269288
<item type="directory">Lib::tiny_mce</item>
270289
<item type="directory">Lib::varien</item>
@@ -276,9 +295,8 @@
276295
<item type="directory">Lib::extjs</item>
277296
<item type="directory">Lib::prototype</item>
278297
<item type="directory">Lib::scriptaculous</item>
279-
<item type="directory">Lib::mage/requirejs</item>
298+
<item type="directory">Lib::less</item>
280299
<item type="directory">Lib::mage/adminhtml</item>
281300
<item type="directory">Lib::mage/backend</item>
282-
<item type="directory">Magento_Swagger::swagger-ui</item>
283301
</exclude>
284302
</view>

‎app/design/frontend/Magento/luma/etc/view.xml

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -263,21 +263,40 @@
263263
<var name="bundle_size">1MB</var>
264264
</vars>
265265
<exclude>
266+
<item type="file">Lib::jquery/jquery.min.js</item>
266267
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
267268
<item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
268269
<item type="file">Lib::jquery/jquery.details.js</item>
269270
<item type="file">Lib::jquery/jquery.details.min.js</item>
270271
<item type="file">Lib::jquery/jquery.hoverIntent.js</item>
271-
<item type="file">Lib::jquery/jquery.min.js</item>
272+
<item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
273+
<item type="file">Lib::requirejs/require.js</item>
274+
<item type="file">Lib::requirejs/text.js</item>
275+
<item type="file">Lib::date-format-normalizer.js</item>
276+
<item type="file">Lib::legacy-build.min.js</item>
272277
<item type="file">Lib::mage/captcha.js</item>
273278
<item type="file">Lib::mage/dropdown_old.js</item>
274279
<item type="file">Lib::mage/list.js</item>
275280
<item type="file">Lib::mage/loader_old.js</item>
276281
<item type="file">Lib::mage/webapi.js</item>
277-
<item type="file">Lib::moment.js</item>
278-
<item type="file">Lib::requirejs/require.js</item>
279-
<item type="file">Lib::date-format-normalizer.js</item>
280-
<item type="file">Lib::legacy-build.min.js</item>
282+
<item type="file">Lib::mage/zoom.js</item>
283+
<item type="file">Lib::mage/translate-inline-vde.js</item>
284+
<item type="file">Lib::mage/requirejs/mixins.js</item>
285+
<item type="file">Lib::mage/requirejs/static.js</item>
286+
<item type="file">Magento_Customer::js/zxcvbn.js</item>
287+
<item type="file">Magento_Catalog::js/zoom.js</item>
288+
<item type="file">Magento_Ui::js/lib/step-wizard.js</item>
289+
<item type="file">Magento_Ui::js/form/element/ui-select.js</item>
290+
<item type="file">Magento_Ui::js/form/element/file-uploader.js</item>
291+
<item type="file">Magento_Ui::js/form/components/insert.js</item>
292+
<item type="file">Magento_Ui::js/form/components/insert-listing.js</item>
293+
<item type="directory">Magento_Ui::js/timeline</item>
294+
<item type="directory">Magento_Ui::js/grid</item>
295+
<item type="directory">Magento_Ui::js/dynamic-rows</item>
296+
<item type="directory">Magento_Ui::templates/timeline</item>
297+
<item type="directory">Magento_Ui::templates/grid</item>
298+
<item type="directory">Magento_Ui::templates/dynamic-rows</item>
299+
<item type="directory">Magento_Swagger::swagger-ui</item>
281300
<item type="directory">Lib::modernizr</item>
282301
<item type="directory">Lib::tiny_mce</item>
283302
<item type="directory">Lib::varien</item>
@@ -289,9 +308,8 @@
289308
<item type="directory">Lib::extjs</item>
290309
<item type="directory">Lib::prototype</item>
291310
<item type="directory">Lib::scriptaculous</item>
292-
<item type="directory">Lib::mage/requirejs</item>
311+
<item type="directory">Lib::less</item>
293312
<item type="directory">Lib::mage/adminhtml</item>
294313
<item type="directory">Lib::mage/backend</item>
295-
<item type="directory">Magento_Swagger::swagger-ui</item>
296314
</exclude>
297315
</view>

‎lib/web/jquery/colorpicker/js/colorpicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*/
99

10-
require([
10+
define([
1111
"jquery",
1212
], function ($) {
1313
var ColorPicker = function () {

0 commit comments

Comments
 (0)