Author: xlawrence
Date: Fri Jun 22 15:42:38 2007
New Revision: 17721
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17721&repname=
=3Djahia
Log:
backport last SP fixes regarding display problems of the tree in IE7, IE6 a=
nd FF
Modified:
trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
ee.js
trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
eeProperties.js
trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/cTree.css
Modified: trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/Com=
plexTree.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/javascript/zimbra/complexTree/ComplexTree.js&rev=3D17721&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
ee.js (original)
+++ trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
ee.js Fri Jun 22 15:42:38 2007
@@ -64,7 +64,7 @@
ComplexTreeProperties.PAGE,
entryPointURL, expandServerUrl, collapseServerUrl,=
expandServerUrlLoaded,
parentDiv);
- if (AjxEnv.isIE) ComplexTreeProperties.ROW_HEIGHT =3D 31;
+ if (AjxEnv.isIE) ComplexTreeProperties.ROW_HEIGHT =3D 29;
break;
=
case ComplexTreeProperties.VERSIONNING_STYLE:
@@ -143,6 +143,7 @@
ComplexTreeProperties.CATEGORY,
entryPointURL, expandServerUrl, collapseServerUrl,=
expandServerUrlLoaded,
parentDiv);
+ if (AjxEnv.isIE) ComplexTreeProperties.ROW_HEIGHT =3D 29;
break;
=
case ComplexTreeProperties.SELECT_CATEGORY_STYLE:
@@ -161,14 +162,7 @@
ComplexTreeProperties.CATEGORY,
entryPointURL, expandServerUrl, collapseServerUrl,=
expandServerUrlLoaded,
parentDiv);
- break;
- case ComplexTreeProperties.PORTLET_CATEGORY_STYLE:
- this._props =3D new ComplexTreeProperties(ComplexTreePrope=
rties.PORTLET_CATEGORY_STYLE,
- ComplexTreeProperties.CATEGORY_PORTLET_TREE_STYLE_=
PATTERN,
- [],
- ComplexTreeProperties.CATEGORY,
- entryPointURL, expandServerUrl, collapseServerUrl,=
expandServerUrlLoaded,
- parentDiv);
+ if (AjxEnv.isIE) ComplexTreeProperties.ROW_HEIGHT =3D 29;
break;
}
=
@@ -829,7 +823,6 @@
this._displayChildren(treeItem);
} else {
this.DATA_HEIGHT +=3D (children.length - ignoredItems) * ComplexTr=
eeProperties.ROW_HEIGHT;
- this._pageInfoView.setUI();
if (this._maximize) {
this._adjustBestHeight();
}
@@ -934,6 +927,9 @@
treeItem.setExpanded(true);
// Build the tree
this._getChildrenCallback(args);
+ } else if (treeItem.getItemCount() =3D=3D 1 && treeItem.getItems()[0].=
getText() =3D=3D this._loadingText) {
+ // delete the 'Loading...' node
+ treeItem.removeChild(treeItem.getItems()[0]);
}
=
if (this.updateBar) updateMenuBarAfterSelect(treeItem._key);
Modified: trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/Com=
plexTreeProperties.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/javascript/zimbra/complexTree/ComplexTreeProperties.js&rev=3D177=
21&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
eeProperties.js (original)
+++ trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
eeProperties.js Fri Jun 22 15:42:38 2007
@@ -42,7 +42,7 @@
=
// Properties used only in ComplexTreeDisplay.js for UI looks
ComplexTreeProperties.LOADING_ID =3D -1;
-ComplexTreeProperties.ROW_HEIGHT =3D (AjxEnv.isIE ? 29 : 28);
+ComplexTreeProperties.ROW_HEIGHT =3D (AjxEnv.isIE ? 27 : 28);
ComplexTreeProperties.SHELL_HEIGHT =3D 320;
ComplexTreeProperties.MIN_TREE_WIDTH =3D 200;
ComplexTreeProperties.MAX_DATA_HEIGHT =3D 600;
Modified: trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/cTr=
ee.css
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/javascript/zimbra/complexTree/cTree.css&rev=3D17721&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/cTree.css=
(original)
+++ trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/cTree.css=
Fri Jun 22 15:42:38 2007
@@ -109,7 +109,6 @@
.DwtTreeItem-Text {
display: block;
height: 22px;
- *height: 24px;
*padding-bottom: 1px;
border-bottom-width: 1px;
border-bottom-style: solid;
@@ -197,12 +196,13 @@
overflow: auto !important;
}
=
+.DwtListView .DwtListView-Rows .Row-selected,
.DwtListView .DwtListView-Rows .Row {
padding-left: 5px;
text-align: left;
height: 27px;
- *height: 30px !important;
- *height: 29px;
+ *height: 28px !important;
+ *height: 27px;
overflow: hidden !important;
}
=
@@ -229,7 +229,6 @@
.DwtListView .DwtListView-Rows .Row-selected td {
height: 27px;
*height: 22px !important;
- *height: 28px;
overflow: hidden !important;
vertical-align: top;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
