X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Fxmenu.top.js;h=ac85e7e1dc6cf649bead0be62072d37e44be5cd7;hp=8d81035a2124ca338a9a6d2697e1f648eca5987f;hb=833cfe5c9938d33c3e6b97ed610c25a7afa6eb04;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2 diff --git a/httemplate/elements/xmenu.top.js b/httemplate/elements/xmenu.top.js index 8d81035a2..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 ) { @@ -370,7 +374,7 @@ WebFXMenuButton.prototype.toString = function () { )) + ">" + this.text + - (this.subMenu ? "" : "") + + (this.subMenu ? "" : "") + ""; };