Skip to content

Commit

Permalink
Update jQuery to version 3.5.0 (#12672)
Browse files Browse the repository at this point in the history
* chore(package): update jquery to version 3.5.0

* Fix unit tests

* fix export test

Co-authored-by: greenkeeper[bot] <23040076+greenkeeper[bot]@users.noreply.github.com>
Co-authored-by: EugeniyKiyashko <[email protected]>
  • Loading branch information
3 people authored Apr 13, 2020
1 parent b3020ac commit 00caf5d
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"handlebars": "^4.7.3",
"hogan.js": "3.0.2",
"intl": "^1.2.5",
"jquery": "^3.4.1",
"jquery": "^3.5.0",
"jquery.1": "^1.0.0",
"jquery.2": "^1.0.0",
"jquery.tmpl": "0.0.2",
Expand Down
8 changes: 5 additions & 3 deletions testing/tests/DevExpress.exporter/excelCreator.tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -765,9 +765,11 @@ QUnit.test('xl\\worksheets\\sheet1.xml file content with AutoFilter', function(a
assert.expect(2);
this.excelCreator._zip.folder(internals.XL_FOLDER_NAME + '/' + internals.WORKSHEETS_FOLDER).file(internals.WORKSHEET_FILE_NAME).async('string').then(function(content) {
try {
const $autoFilter = $(content).find('autoFilter');
assert.strictEqual($autoFilter.parent()[0].tagName.toLowerCase(), 'worksheet');
assert.strictEqual($autoFilter.attr('ref'), 'A2:A3');
const oParser = new DOMParser();
const oDOM = oParser.parseFromString(content, 'application/xml');

assert.strictEqual(oDOM.documentElement.nodeName, 'worksheet');
assert.strictEqual(oDOM.querySelector('autoFilter').getAttribute('ref'), 'A2:A3');
} finally {
done();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,10 @@ QUnit.module(
});

QUnit.test('quoted names in binding, regression case', function(assert) {
const markup = $('<div><div /><div /></div>').appendTo(FIXTURE_ELEMENT);
const markup = $(`<div>
<div></div>
<div></div>
</div>`).appendTo(FIXTURE_ELEMENT);
const child1 = markup.children().eq(0).attr('data-bind', '"dxTest": { "text": 1}');
const child2 = markup.children().eq(1).attr('data-bind', '\'dxTest\': { \'text\': 2}');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4237,7 +4237,7 @@ QUnit.module('Headers reordering', {
const controller = this.createDraggingHeaderViewController();
const draggingHeader = new TestDraggingHeader(this.component);

$('#itemsContainer').html('<div style="width:125px; display: inline-block;" /><div style="width:125px; display: inline-block;" />');
$('#itemsContainer').html('<div style="width:125px; display: inline-block;"></div><div style="width:125px; display: inline-block;"></div>');

controller.drop = function(parameters) {
if(this.allowDrop(parameters)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,9 @@ QUnit.module('Keyboard controller', {
<tr class='dx-row'>"
<td class='cell-0'><input></td>
<td><input></td>
<td><textarea /></td>
<td><textarea></textarea></td>
<td><a>Link<a/></td>
<td><select /></td>
<td><select></select></td>
</tr>`));

const view = this.getView('rowsView');
Expand Down

0 comments on commit 00caf5d

Please sign in to comment.