diff options
| author | mark <mark> | 2012-01-23 21:22:57 +0000 |
|---|---|---|
| committer | mark <mark> | 2012-01-23 21:22:57 +0000 |
| commit | c906c82c176ddaf7897a13fc78b1264e2f5d25bd (patch) | |
| tree | d2d992c730fcb39b2c2fd271efa5dc9d4e92191f /httemplate/elements | |
| parent | f5aa3dd9639ac3d8655ae7452ceda5dc174db410 (diff) | |
fix xmenus in opera
Diffstat (limited to 'httemplate/elements')
| -rw-r--r-- | httemplate/elements/xmenu.js | 8 | ||||
| -rw-r--r-- | httemplate/elements/xmenu.top.js | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/httemplate/elements/xmenu.js b/httemplate/elements/xmenu.js index 3ef9a3ddc..4050ea041 100644 --- a/httemplate/elements/xmenu.js +++ b/httemplate/elements/xmenu.js @@ -14,7 +14,7 @@ // check browsers var ua = navigator.userAgent; -var opera = /opera [56789]|opera\/[56789]/i.test(ua); +var opera = window.opera || /opera [56789]|opera\/[56789]/i.test(ua); var ie = !opera && /MSIE/.test(ua); var ie50 = ie && /MSIE 5\.[01234]/.test(ua); var ie6 = ie && /MSIE [6789]/.test(ua); @@ -190,8 +190,10 @@ WebFXMenu.prototype.show = function (relObj, sDir) { var divElement = document.getElementById(this.id); if ( divElement ) { - divElement.style.left = opera ? this.left : this.left + "px"; - divElement.style.top = opera ? this.top : this.top + "px"; + //divElement.style.left = opera ? this.left : this.left + "px"; + //divElement.style.top = opera ? this.top : this.top + "px"; + divElement.style.left = this.left + "px"; + divElement.style.top = this.top + "px"; divElement.style.visibility = "visible"; if ( ie ) { diff --git a/httemplate/elements/xmenu.top.js b/httemplate/elements/xmenu.top.js index b9df515c4..ac85e7e1d 100644 --- a/httemplate/elements/xmenu.top.js +++ b/httemplate/elements/xmenu.top.js @@ -14,7 +14,9 @@ // check browsers var ua = navigator.userAgent; -var opera = /opera [56789]|opera\/[56789]/i.test(ua); +// "window.opera" exists in Opera 10+, and needs to be preserved for FCKeditor +// to work. +var opera = window.opera || /opera [56789]|opera\/[56789]/i.test(ua); var ie = !opera && /MSIE/.test(ua); var ie50 = ie && /MSIE 5\.[01234]/.test(ua); var ie6 = ie && /MSIE [6789]/.test(ua); @@ -190,8 +192,10 @@ WebFXMenu.prototype.show = function (relObj, sDir) { var divElement = document.getElementById(this.id); if ( divElement ) { - divElement.style.left = opera ? this.left : this.left + "px"; - divElement.style.top = opera ? this.top : this.top + "px"; + //divElement.style.left = opera ? this.left : this.left + "px"; + //divElement.style.top = opera ? this.top : this.top + "px"; + divElement.style.left = this.left + "px"; + divElement.style.top = this.top + "px"; divElement.style.visibility = "visible"; if ( ie ) { |