Author: sdumitriu
Date: 2008-02-15 17:55:49 +0100 (Fri, 15 Feb 2008)
New Revision: 7766
Modified:
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/ajax/panelWizard.js
Log:
[cleanup] Minor fixes
Merged from [EMAIL PROTECTED]
Modified:
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/ajax/panelWizard.js
===================================================================
---
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/ajax/panelWizard.js
2008-02-15 16:50:40 UTC (rev 7765)
+++
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/ajax/panelWizard.js
2008-02-15 16:55:49 UTC (rev 7766)
@@ -273,36 +273,40 @@
pos = window.allPanelsPlace[i]['left'];
if (pos != -1){
el = panelsOnLeft[pos];
- el.fullname=window.allPanelsPlace[i].fullname;
- el.placeholder = document.createElement("div");
- el.placeholder.className="placeholder";
- if(window.ActiveXObject) {
- el.displayHeight = (el.offsetHeight ? (el.offsetHeight) : 0);
+ if (el) {
+ el.fullname=window.allPanelsPlace[i].fullname;
+ el.placeholder = document.createElement("div");
+ el.placeholder.className="placeholder";
+ if(window.ActiveXObject) {
+ el.displayHeight = (el.offsetHeight ? (el.offsetHeight) : 0);
+ }
+ else {
+ el.displayHeight = (el.offsetHeight ? (el.offsetHeight-2) : 0);
+ }
+ el.placeholder.style.height = (el.displayHeight) +"px";
+ el.placeholder.style.display = "block";
+ panelsInList[i].parentNode.replaceChild(el.placeholder,
panelsInList[i]);
}
- else {
- el.displayHeight = (el.offsetHeight ? (el.offsetHeight-2) : 0);
- }
- el.placeholder.style.height = (el.displayHeight) +"px";
- el.placeholder.style.display = "block";
- panelsInList[i].parentNode.replaceChild(el.placeholder, panelsInList[i]);
}
pos = window.allPanelsPlace[i]['right'];
if (pos != -1){
el = panelsOnRight[pos];
- el.fullname=window.allPanelsPlace[i].fullname;
- el.placeholder = document.createElement("div");
- el.placeholder.className="placeholder";
- if(window.ActiveXObject) {
- el.displayHeight = (el.offsetHeight ? (el.offsetHeight) : 0);
+ if (el) {
+ el.fullname=window.allPanelsPlace[i].fullname;
+ el.placeholder = document.createElement("div");
+ el.placeholder.className="placeholder";
+ if(window.ActiveXObject) {
+ el.displayHeight = (el.offsetHeight ? (el.offsetHeight) : 0);
+ }
+ else {
+ el.displayHeight = (el.offsetHeight ? (el.offsetHeight-2) : 0);
+ }
+ el.placeholder.style.height = (el.displayHeight) +"px";
+ el.placeholder.style.display = "block";
+ if(panelsInList[i].parentNode) {
+ panelsInList[i].parentNode.replaceChild(el.placeholder,
panelsInList[i]);
+ }
}
- else {
- el.displayHeight = (el.offsetHeight ? (el.offsetHeight-2) : 0);
- }
- el.placeholder.style.height = (el.displayHeight) +"px";
- el.placeholder.style.display = "block";
- if(panelsInList[i].parentNode) {
- panelsInList[i].parentNode.replaceChild(el.placeholder,
panelsInList[i]);
- }
}
panelsInList[i].fullname=window.allPanelsPlace[i].fullname;
}
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
