Author: abelevich Date: 2008-12-18 12:18:33 -0500 (Thu, 18 Dec 2008) New Revision: 11894 Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js Log: some fixes Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js =================================================================== --- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js 2008-12-18 17:15:10 UTC (rev 11893) +++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js 2008-12-18 17:18:33 UTC (rev 11894) @@ -62,11 +62,27 @@ }*/ if( typeof document.documentElement != 'undefined' && typeof document.documentElement.clientWidth != 'undefined' && document.documentElement.clientWidth != 0 ) { - return document.viewport.getDimensions().height + document.viewport.getScrollOffsets().top; + return document.viewport.getDimensions().height + document.viewport.getScrollOffsets().top; } else { - var scrollOffsets = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0; - var innerHeight = self.innerHeight || document.documentElement.clientHeight || document.body.clientHeight || 0; - return innerHeight + scrollOffsets; + + var scrollOffsets = 0; + var innerHeight = 0; + + if(document.documentElement) { + scrollOffsets += document.documentElement.scrollTop ? document.documentElement.scrollTop : 0 ; + innerHeight += document.documentElement.clientHeigh ? document.documentElement.clientHeigh : 0 ; + } + + if (document.body) { + scrollOffsets += document.body.scrollTop ? document.body.scrollTop : 0; + innerHeight += document.body.clientHeight ? document.body.clientHeight : 0; + } + + scrollOffsets += window.pageYOffset; + innerHeight += self.innerHeight; + + return innerHeight + scrollOffsets; + } //return viewportheight; Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js =================================================================== --- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-12-18 17:15:10 UTC (rev 11893) +++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-12-18 17:18:33 UTC (rev 11894) @@ -408,7 +408,7 @@ iframe.style.position = "absolute"; iframe.frameBorder="0"; iframe.scrolling="no"; - iframe.src="blank.html"; + iframe.src="javascript:''"; iframe.style.width = width;