[freeside-commits] freeside/httemplate/elements xmenu.js, 1.2, 1.2.6.1 xmenu.top.js, 1.2, 1.2.6.1

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv24966/httemplate/elements

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	xmenu.js xmenu.top.js 
Log Message:
fix xmenus in opera

Index: xmenu.js
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/xmenu.js,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -w -d -r1.2 -r1.2.6.1
--- xmenu.js	20 Mar 2010 22:44:48 -0000	1.2
+++ xmenu.js	23 Jan 2012 21:23:07 -0000	1.2.6.1
@@ -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 @@
 	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 ) {

Index: xmenu.top.js
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/xmenu.top.js,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -w -d -r1.2 -r1.2.6.1
--- xmenu.top.js	20 Mar 2010 22:11:37 -0000	1.2
+++ xmenu.top.js	23 Jan 2012 21:23:07 -0000	1.2.6.1
@@ -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 @@
 	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 ) {