Skip to content

Commit 108f621

Browse files
guz-antonguz-anton
committed
Merge pull request #47 from magento-vanilla/PR
[Vanilla] Bug Fixes. P1. JS static fails
2 parents d59a6fd + 3253282 commit 108f621

File tree

25 files changed

+129
-106
lines changed

25 files changed

+129
-106
lines changed

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010

1111
<?php $_divId = 'tree-div_' . time() ?>
1212
<div id="<?php /* @escapeNotVerified */ echo $_divId ?>" class="tree"></div>
13-
<!--[if IE]>
1413
<script id="ie-deferred-loader" defer="defer" src=""></script>
15-
<![endif]-->
1614
<script>
1715
require([
1816
'jquery',

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
<div><?php /* @escapeNotVerified */ echo __('This operation can take a long time'); ?></div>
3636
</div>
3737
</div>
38-
<!--[if IE]>
3938
<script id="ie-deferred-loader" defer="defer" src=""></script>
40-
<![endif]-->
4139
<script>
4240
var tree;
4341
require([

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010

1111
<?php $_divId = 'tree' . $block->getId() ?>
1212
<div id="<?php /* @escapeNotVerified */ echo $_divId ?>" class="tree"></div>
13-
<!--[if IE]>
1413
<script id="ie-deferred-loader" defer="defer" src=""></script>
15-
<![endif]-->
14+
<![]-->
1615
<script>
1716
require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
1817

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@
3838
<span class="title"><?php /* @escapeNotVerified */ echo __('Unassigned Attributes') ?></span>
3939
</div>
4040
<div id="tree-div2" class="attribute-set-tree"></div>
41-
<!--[if IE]>
4241
<script id="ie-deferred-loader" defer="defer" src=""></script>
43-
<![endif]-->
4442
<script>
4543
define("tree-panel",
4644
[

‎app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ define([
5353
actions: {
5454
confirm: function () {
5555
self._removeItem($(event.currentTarget));
56+
},
57+
always: function (event) {
58+
event.stopImmediatePropagation();
5659
}
5760
}
5861
});

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

+8
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,14 @@
8585
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.bookmarks</item>
8686
<item name="namespace" xsi:type="string">current.filters</item>
8787
</item>
88+
<item name="templates" xsi:type="array">
89+
<item name="filters" xsi:type="array">
90+
<item name="select" xsi:type="array">
91+
<item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item>
92+
<item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item>
93+
</item>
94+
</item>
95+
</item>
8896
<item name="childDefaults" xsi:type="array">
8997
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.listing_filters</item>
9098
<item name="imports" xsi:type="array">

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

+8
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@
8686
<item name="provider" xsi:type="string">cms_page_listing.cms_page_listing.listing_top.bookmarks</item>
8787
<item name="namespace" xsi:type="string">current.filters</item>
8888
</item>
89+
<item name="templates" xsi:type="array">
90+
<item name="filters" xsi:type="array">
91+
<item name="select" xsi:type="array">
92+
<item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item>
93+
<item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item>
94+
</item>
95+
</item>
96+
</item>
8997
<item name="childDefaults" xsi:type="array">
9098
<item name="provider" xsi:type="string">cms_page_listing.cms_page_listing.listing_top.listing_filters</item>
9199
<item name="imports" xsi:type="array">

‎app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml

+17-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/** @var $block \Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Text */
1010
?>
11-
<fieldset class="fieldset ignore-validate">
11+
<fieldset class="fieldset">
1212
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Swatch (values of your attribute)') ?></span></legend>
1313
<div id="swatch-text-options-panel">
1414
<?php //@todo move style to css file ?>
@@ -33,16 +33,23 @@
3333
<th class="col-delete">&nbsp;</th>
3434
</tr>
3535
</thead>
36-
<tbody data-role="swatch-text-options-container"></tbody>
36+
<tbody data-role="swatch-text-options-container" class="ignore-validate"></tbody>
3737
<tfoot>
38-
<th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>" class="col-actions-add">
39-
<?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
40-
<button id="add_new_swatch_text_option_button" title="<?php /* @escapeNotVerified */ echo __('Add Swatch'); ?>"
41-
type="button" class="action- scalable add">
42-
<span><?php /* @escapeNotVerified */ echo __('Add Swatch'); ?></span>
43-
</button>
44-
<?php endif; ?>
45-
</th>
38+
<tr>
39+
<th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>">
40+
<input type="hidden" class="required-swatch-entry"/>
41+
</th>
42+
</tr>
43+
<tr>
44+
<th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>" class="col-actions-add">
45+
<?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
46+
<button id="add_new_swatch_text_option_button" title="<?php /* @escapeNotVerified */ echo __('Add Swatch'); ?>"
47+
type="button" class="action- scalable add">
48+
<span><?php /* @escapeNotVerified */ echo __('Add Swatch'); ?></span>
49+
</button>
50+
<?php endif; ?>
51+
</th>
52+
</tr>
4653
</tfoot>
4754
</table>
4855
<input type="hidden" id="swatch-text-option-count-check" value="" />

‎app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml

+17-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/** @var $block \Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Visual */
1010
?>
11-
<fieldset class="fieldset ignore-validate">
11+
<fieldset class="fieldset">
1212
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Swatch (values of your attribute)') ?></span></legend>
1313
<div id="swatch-visual-options-panel">
1414
<?php //@todo move style to css file ?>
@@ -29,16 +29,23 @@
2929
<th class="col-delete">&nbsp;</th>
3030
</tr>
3131
</thead>
32-
<tbody data-role="swatch-visual-options-container"></tbody>
32+
<tbody data-role="swatch-visual-options-container" class="ignore-validate"></tbody>
3333
<tfoot>
34-
<th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>" class="col-actions-add">
35-
<?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
36-
<button id="add_new_swatch_visual_option_button" title="<?php /* @escapeNotVerified */ echo __('Add Swatch'); ?>"
37-
type="button" class="action- scalable add">
38-
<span><?php /* @escapeNotVerified */ echo __('Add Swatch'); ?></span>
39-
</button>
40-
<?php endif; ?>
41-
</th>
34+
<tr>
35+
<th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>">
36+
<input type="hidden" class="required-swatch-entry"/>
37+
</th>
38+
</tr>
39+
<tr>
40+
<th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>" class="col-actions-add">
41+
<?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
42+
<button id="add_new_swatch_visual_option_button" title="<?php /* @escapeNotVerified */ echo __('Add Swatch'); ?>"
43+
type="button" class="action- scalable add">
44+
<span><?php /* @escapeNotVerified */ echo __('Add Swatch'); ?></span>
45+
</button>
46+
<?php endif; ?>
47+
</th>
48+
</tr>
4249
</tfoot>
4350
</table>
4451
<input type="hidden" id="swatch-visual-option-count-check" value="" />

‎app/code/Magento/Ui/Component/Filters.php

+5
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ public function update(UiComponentInterface $component)
7373
{
7474
if ($component instanceof ColumnInterface) {
7575
$filterType = $component->getData('config/filter');
76+
77+
if (is_array($filterType)) {
78+
$filterType = $filterType['filterType'];
79+
}
80+
7681
if (!$filterType) {
7782
return;
7883
}

‎app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js

-13
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,6 @@ define([
5757
}
5858
},
5959

60-
/**
61-
* Extends instance with defaults, extends config with formatted values
62-
* and options, and invokes initialize method of AbstractElement class.
63-
*
64-
* @returns {Object} Chainable
65-
*/
66-
initialize: function () {
67-
this._super()
68-
.initOptions();
69-
70-
return this;
71-
},
72-
7360
/**
7461
* Parses options and merges the result with instance
7562
*

‎app/code/Magento/Ui/view/base/web/js/lib/registry/events.js

+16-16
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © 2015 Magento. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
define([
67
'underscore',
78
'mageUtils',
@@ -13,11 +14,11 @@ define([
1314
* @constructor
1415
*/
1516
function Events(storage) {
16-
this.id = 0,
17+
this.id = 0;
1718

18-
this.requests = new Map();
19-
this.map = {};
20-
this.storage = storage;
19+
this.requests = new Map();
20+
this.map = {};
21+
this.storage = storage;
2122

2223
_.bindAll(this, '_resolve', '_clear');
2324
}
@@ -28,7 +29,7 @@ define([
2829
/**
2930
* Tries to resolve dependencies affected by the scpecified element.
3031
* @param {String} elem - Elements' name.
31-
* @returns {events} Chainable.
32+
* @returns {Object} Chainable.
3233
*/
3334
resolve: function (elem) {
3435
var pending = this.map[elem];
@@ -44,17 +45,16 @@ define([
4445

4546
/**
4647
* Creates a new request for the specified set
47-
of elements in case some of them wasn't registered yeat.
48-
Otherwise triggers callback immediately.
48+
* of elements in case some of them wasn't registered yeat.
49+
* Otherwise triggers callback immediately.
4950
* @param {Array} elems - Requested elements.
50-
* @param {Function} callback -
51-
Callback that will be triggered as soon as
52-
all of the elements will be registered.
51+
* @param {Object} callback - that will be triggered as soon as
52+
* all of the elements will be registered.
5353
* @returns {events} Chainable.
5454
*/
5555
wait: function (elems, callback) {
5656
var storage = this.storage,
57-
map = this.map;
57+
map = this.map;
5858

5959
if (storage.has(elems)) {
6060
return callback.apply(null, storage.get(elems));
@@ -79,9 +79,9 @@ define([
7979
* @returns {Boolean} Whether specified request was successfully resolved.
8080
*/
8181
_resolve: function (id) {
82-
var request = this.requests.get(id),
83-
elems = request.deps,
84-
storage = this.storage,
82+
var request = this.requests.get(id),
83+
elems = request.deps,
84+
storage = this.storage,
8585
isResolved;
8686

8787
isResolved = storage.has(elems);
@@ -99,8 +99,8 @@ define([
9999
* @param {Number} id - Id of request.
100100
*/
101101
_clear: function (id) {
102-
var map = this.map,
103-
elems = this.requests.get(id).deps;
102+
var map = this.map,
103+
elems = this.requests.get(id).deps;
104104

105105
elems.forEach(function (elem) {
106106
utils.remove(map[elem], id);

‎app/code/Magento/Ui/view/base/web/js/modal/confirm.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ define([
4040
/**
4141
* Click handler.
4242
*/
43-
click: function () {
44-
this.closeModal();
43+
click: function (event) {
44+
this.closeModal(event);
4545
}
4646
}, {
4747
text: $.mage.__('OK'),
@@ -50,8 +50,8 @@ define([
5050
/**
5151
* Click handler.
5252
*/
53-
click: function () {
54-
this.closeModal(true);
53+
click: function (event) {
54+
this.closeModal(event, true);
5555
}
5656
}]
5757
},
@@ -82,15 +82,15 @@ define([
8282
/**
8383
* Close modal window.
8484
*/
85-
closeModal: function (result) {
85+
closeModal: function (event, result) {
8686
result = result || false;
8787

8888
if (result) {
89-
this.options.actions.confirm();
89+
this.options.actions.confirm(event);
9090
} else {
91-
this.options.actions.cancel();
91+
this.options.actions.cancel(event);
9292
}
93-
this.options.actions.always();
93+
this.options.actions.always(event);
9494
this.element.bind('confirmclosed', _.bind(this._remove, this));
9595

9696
return this._super();

‎app/code/Magento/Ui/view/base/web/js/modal/modal.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ define([
7878
/**
7979
* Default action on button click
8080
*/
81-
click: function () {
82-
this.closeModal();
81+
click: function (event) {
82+
this.closeModal(event);
8383
}
8484
}]
8585
},

‎app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010

1111
<?php $_divId = 'tree' . $block->getId() ?>
1212
<div id="<?php /* @escapeNotVerified */ echo $_divId ?>" class="tree"></div>
13-
<!--[if IE]>
1413
<script id="ie-deferred-loader" defer="defer" src=""></script>
15-
<![endif]-->
1614
<script>
1715
require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
1816

‎app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml

-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
<div class="actions"><?php echo $block->getAddLayoutButtonHtml() ?></div>
1616
</div>
1717
</fieldset>
18-
<!--[if IE]>
1918
<script id="ie-deferred-loader" defer="defer" src=""></script>
20-
<![endif]-->
2119
<script>
2220
require([
2321
'jquery',

‎dev/tools/grunt/assets/legacy-build/shim.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
(function () {
66
'use strict';
77

8-
var globals = ['Prototype', 'Abstract', 'Try', 'Class', 'PeriodicalExecuter', 'Template', '$break', 'Enumerable', '$A', '$w', '$H', 'Hash', '$R', 'ObjectRange', 'Ajax', '$', 'Form', 'Field', '$F', 'Toggle', 'Insertion', '$continue', 'Position', 'Windows', 'Dialog', 'array', 'WindowUtilities', 'Builder', 'Effect', 'validateCreditCard', 'Validator', 'Validation', 'removeDelimiters', 'parseNumber', 'popWin', 'setLocation', 'setPLocation', 'setLanguageCode', 'decorateGeneric', 'decorateTable', 'decorateList', 'decorateDataList', 'parseSidUrl', 'formatCurrency', 'expandDetails', 'isIE', 'Varien', 'fireEvent', 'modulo', 'byteConvert', 'SessionError', 'varienLoader', 'varienLoaderHandler', 'setLoaderPosition', 'toggleSelectsUnderBlock', 'varienUpdater', 'confirmSetLocation', 'deleteConfirm', 'setElementDisable', 'toggleParentVis', 'toggleFieldsetVis', 'toggleVis', 'imagePreview', 'checkByProductPriceType', 'toggleSeveralValueElements', 'toggleValueElements', 'submitAndReloadArea', 'syncOnchangeValue', 'updateElementAtCursor', 'firebugEnabled', 'disableElement', 'enableElement', 'disableElements', 'enableElements', 'Cookie', 'Fieldset', 'Base64', 'sortNumeric', 'Element', '$$', 'Sizzle', 'Selector', 'Window'];
8+
var globals = ['Prototype', 'Abstract', 'Try', 'Class', 'PeriodicalExecuter', 'Template', '$break', 'Enumerable', '$A', '$w', '$H', 'Hash', '$R', 'ObjectRange', 'Ajax', '$', 'Form', 'Field', '$F', 'Toggle', 'Insertion', '$continue', 'Position', 'Windows', 'Dialog', 'array', 'WindowUtilities', 'Builder', 'Effect', 'validateCreditCard', 'Validator', 'Validation', 'removeDelimiters', 'parseNumber', 'popWin', 'setLocation', 'setPLocation', 'setLanguageCode', 'decorateGeneric', 'decorateTable', 'decorateList', 'decorateDataList', 'parseSidUrl', 'formatCurrency', 'expandDetails', 'isIE', 'Varien', 'fireEvent', 'modulo', 'byteConvert', 'SessionError', 'varienLoader', 'varienLoaderHandler', 'setLoaderPosition', 'toggleSelectsUnderBlock', 'varienUpdater', 'setElementDisable', 'toggleParentVis', 'toggleFieldsetVis', 'toggleVis', 'imagePreview', 'checkByProductPriceType', 'toggleSeveralValueElements', 'toggleValueElements', 'submitAndReloadArea', 'syncOnchangeValue', 'updateElementAtCursor', 'firebugEnabled', 'disableElement', 'enableElement', 'disableElements', 'enableElements', 'Cookie', 'Fieldset', 'Base64', 'sortNumeric', 'Element', '$$', 'Sizzle', 'Selector', 'Window'];
99

1010
globals.forEach(function (prop) {
1111
/* jshint evil:true */

‎lib/web/fotorama/fotorama.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -2229,14 +2229,9 @@ fotoramaVersion = '4.6.4';
22292229
stageLeft = 0,
22302230

22312231
fadeStack = [];
2232-
if (Modernizr.touch) {
2233-
$wrap[STAGE_FRAME_KEY] = $('<a class="' + stageFrameClass + '" target="_blank"></a>');
2234-
} else {
2235-
$wrap[STAGE_FRAME_KEY] = $('<div class="' + stageFrameClass + '"></div>');
2236-
}
22372232

2233+
$wrap[STAGE_FRAME_KEY] = $('<div class="' + stageFrameClass + '"></div>');
22382234
$wrap[NAV_THUMB_FRAME_KEY] = $($.Fotorama.jst.thumb());
2239-
22402235
$wrap[NAV_DOT_FRAME_KEY] = $($.Fotorama.jst.dots());
22412236

22422237
toDeactivate[STAGE_FRAME_KEY] = [];

‎lib/web/fotorama/fotorama.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/web/legacy-build.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/web/mage/adminhtml/tools.js

-11
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,6 @@ function setLocation(url){
66
window.location.href = url;
77
}
88

9-
function confirmSetLocation(message, url){
10-
if( confirm(message) ) {
11-
setLocation(url);
12-
}
13-
return false;
14-
}
15-
16-
function deleteConfirm(message, url) {
17-
confirmSetLocation(message, url);
18-
}
19-
209
function setElementDisable(element, disable){
2110
if($(element)){
2211
$(element).disabled = disable;

0 commit comments

Comments
 (0)