Module: check_mk
Branch: master
Commit: e8cebdd8fe5fed8c509fa72ba6cf7e5c9d4818c6
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8cebdd8fe5fed…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Aug 26 14:45:13 2011 +0200
FIX: Fixed js errors in IE when having not enough space on dashboard
---
ChangeLog | 1 +
web/htdocs/js/dashboard.js | 37 +++++++++++++++++++++----------------
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9860aee..9810bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
the title of the file/folder in WATO
* FIX: Removed new python syntax which is incompatible with old python versions
* FIX: Made bulk inventory work in IE
+ * FIX: Fixed js errors in IE when having not enough space on dashboard
* Views are not reloaded completely anymore. The data tables are reloaded
on their own.
* Open tabs in views do not prevent reloading the displayed data anymore
diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js
index adb8bb4..7d461fd 100644
--- a/web/htdocs/js/dashboard.js
+++ b/web/htdocs/js/dashboard.js
@@ -26,11 +26,12 @@ function resize_dashlets(id, code)
{
var resize_info = eval(code);
+ var oDash = null;
for (var i in resize_info) {
var dashlet = resize_info[i];
// check if dashlet has title and resize its width
- var oDash = document.getElementById("dashlet_title_" + dashlet[0]);
+ oDash = document.getElementById("dashlet_title_" + dashlet[0]);
if (oDash) {
oDash.style.width = dashlet[3] + "px";
oDash.style.top = "-" + title_height + "px";
@@ -38,7 +39,7 @@ function resize_dashlets(id, code)
}
// resize outer div
- var oDash = document.getElementById("dashlet_" + dashlet[0]);
+ oDash = document.getElementById("dashlet_" + dashlet[0]);
oDash.style.position = 'absolute';
oDash.style.left = dashlet[1] + "px";
oDash.style.top = dashlet[2] + "px";
@@ -46,26 +47,30 @@ function resize_dashlets(id, code)
oDash.style.height = dashlet[4] + "px";
// resize shadow images
- var oDash = document.getElementById("dashadow_w_" + dashlet[0]);
- if (oDash)
+ oDash = document.getElementById("dashadow_w_" + dashlet[0]);
+ if(oDash && dashlet[4] - 32 > 0)
oDash.style.height = (dashlet[4] - 32) + "px";
- var oDash = document.getElementById("dashadow_e_" + dashlet[0]);
- if (oDash)
+ oDash = document.getElementById("dashadow_e_" + dashlet[0]);
+ if (oDash && dashlet[4] - 32 > 0)
oDash.style.height = (dashlet[4] - 32) + "px";
- var oDash = document.getElementById("dashadow_n_" + dashlet[0]);
- if (oDash)
+ oDash = document.getElementById("dashadow_n_" + dashlet[0]);
+ if (oDash && dashlet[3] - 32 > 0)
oDash.style.width = (dashlet[3] - 32) + "px";
- var oDash = document.getElementById("dashadow_s_" + dashlet[0]);
- if (oDash)
+ oDash = document.getElementById("dashadow_s_" + dashlet[0]);
+ if (oDash && dashlet[3] - 32 > 0)
oDash.style.width = (dashlet[3] - 32) + "px";
// resize content div
- var oDash = document.getElementById("dashlet_inner_" + dashlet[0]);
- oDash.style.position = 'absolute';
- oDash.style.left = dashlet_padding + "px";
- oDash.style.top = dashlet_padding + "px";
- oDash.style.width = (dashlet[3] - 2*dashlet_padding) + "px";
- oDash.style.height = (dashlet[4] - 2*dashlet_padding) + "px";
+ oDash = document.getElementById("dashlet_inner_" + dashlet[0]);
+ if(oDash) {
+ oDash.style.position = 'absolute';
+ oDash.style.left = dashlet_padding + "px";
+ oDash.style.top = dashlet_padding + "px";
+ if((dashlet[3] - 2*dashlet_padding) > 0)
+ oDash.style.width = (dashlet[3] - 2*dashlet_padding) + "px";
+ if((dashlet[4] - 2*dashlet_padding) > 0)
+ oDash.style.height = (dashlet[4] - 2*dashlet_padding) + "px";
+ }
}
oDash = null;
}