Commit 41c30e47 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

jquery vesion changed

parent c7ab4050
......@@ -1208,7 +1208,7 @@
"resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.19.tgz",
"integrity": "sha512-+ljXcI6Pj3PTGy5pesp3E5Dr3x3AV45EZe0o1r0gKENN2gafBKXodVnk2ypKwl2tTmivjxbkiqoWnipTefyBTA==",
"requires": {
"jquery": "1.12.1"
"jquery": "3.2.1"
}
},
"datatables.net-rowreorder": {
......@@ -1217,7 +1217,7 @@
"integrity": "sha512-FHFnEkOpbMk2BJCnRqi4A7lGE3VdiyHEnLRGVEieYH/7ohmJxgrhxHdWratXK4IMs8OvKw51epFeaAaMmXNlZQ==",
"requires": {
"datatables.net": "1.10.19",
"jquery": "1.12.1"
"jquery": "3.2.1"
}
},
"date-now": {
......@@ -2721,9 +2721,9 @@
"integrity": "sha1-MIGz/qZR+TF+xr1P6y3cmKpB1ZU="
},
"jquery": {
"version": "1.12.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-1.12.1.tgz",
"integrity": "sha1-nMNM5HgNTOuQxEMo8HEGTwGWDBg="
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
"integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
},
"jquery-ui-dist": {
"version": "1.12.1",
......@@ -3032,7 +3032,7 @@
"resolved": "https://registry.npmjs.org/jstree/-/jstree-3.3.5.tgz",
"integrity": "sha1-nFeNsy0KZDd1zd2AIK1ZkvQRnBM=",
"requires": {
"jquery": "1.12.1"
"jquery": "3.2.1"
}
},
"jszip": {
......
......@@ -28,7 +28,7 @@
"exorcist": "^0.4.0",
"file-url": "^2.0.0",
"istanbul": "0.4.5",
"jquery": "1.12.1",
"jquery": "3.2.1",
"jquery-ui-dist": "1.12.1",
"jsdom": "11.7.0",
"jshint": "^2.9.6",
......
......@@ -335,15 +335,11 @@ Panel.prototype.onresize = function () {
var self = this;
var footerPosition = window.innerHeight;
var footerHeight = Math.max(0, $(".minerva-logo-footer, .minerva-footer-table").outerHeight());
footerPosition -= footerHeight;
footerPosition -= Math.max(0, $(".minerva-logo-footer, .minerva-footer-table").outerHeight());
// compute the width (we can only compute it for visible elements)
var size = 100000;
console.log(footerPosition, footerHeight);
console.log(footerPosition, footerHeight);
if ($(self.getElement()).is(":visible")) {
$(".pre-scrollable", self.getElement()).each(function (index, element) {
......@@ -360,7 +356,6 @@ Panel.prototype.onresize = function () {
$(element).css('height', size);
});
}
console.log(size, $(self.getElement()).hasClass("pre-scrollable"), self.getPanelName());
if ($(self.getElement()).hasClass("pre-scrollable") && $(self.getElement()).is(":visible")) {
$(self.getElement()).css('max-height', size);
$(self.getElement()).css('height', size);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment