details: /erp/devel/pi/rev/b0e4fd2f413b
changeset: 6507:b0e4fd2f413b
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 26 12:04:22 2010 +0100
summary: Related to issue 12479: Now utils.js has relative references -part2
diffstat:
web/js/utils.js | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diffs (114 lines):
diff -r fa2d62c2d918 -r b0e4fd2f413b web/js/utils.js
--- a/web/js/utils.js Fri Feb 26 10:00:14 2010 +0100
+++ b/web/js/utils.js Fri Feb 26 12:04:22 2010 +0100
@@ -2206,13 +2206,13 @@
* @see #changeClass
*/
function updateMenuIcon(id) {
- if (!top.frameMenu) return false;
+ if (!parent.frameMenu) return false;
else {
- var frame = top.document;
- var frameset = frame.getElementById("framesetMenu");
- if (!frameset) return false;
+ var frameContainer = getFrame('main');
+ var framesetMenu = frameContainer.document.getElementById("framesetMenu");
+ if (!framesetMenu) return false;
try {
- if (top.isMenuHide==true) changeClass(id, "_hide", "_show", true);
+ if (frameContainer.isMenuHide==true) changeClass(id, "_hide", "_show",
true);
else changeClass(id, "_show", "_hide", true);
} catch (ignored) {}
return true;
@@ -2227,10 +2227,11 @@
* @see #changeClass
*/
function menuShowHide(id) {
- if (!top.frameMenu) {
+ if (!parent.frameMenu) {
window.open(baseFrameServlet, "_blank");
} else {
- if (top.isMenuHide == true) {
+ var frameContainer = getFrame('main');
+ if (frameContainer.isMenuHide == true) {
menuShow(id);
} else {
menuHide(id);
@@ -2247,23 +2248,23 @@
* @see #changeClass
*/
function menuShow(id) {
- if (!top.frameMenu) {
+ if (!parent.frameMenu) {
window.open(baseFrameServlet, "_blank");
} else {
if (id==null) {
id = 'buttonMenu';
}
- var frame = top.document;
- var frameset = frame.getElementById("framesetMenu");
- if (!frameset) {
+ var frameContainer = getFrame('main');
+ var framesetMenu = frameContainer.document.getElementById("framesetMenu");
+ if (!framesetMenu) {
return false;
}
- if (top.isRTL == true) {
- frameset.cols = "*," + top.menuWidth + ",0%";
+ if (frameContainer.isRTL == true) {
+ framesetMenu.cols = "*," + frameContainer.menuWidth + ",0%";
} else {
- frameset.cols = "0%," + top.menuWidth + ",*";
+ framesetMenu.cols = "0%," + frameContainer.menuWidth + ",*";
}
- top.isMenuHide = false;
+ frameContainer.isMenuHide = false;
try {
putFocusOnMenu();
} catch(e) {
@@ -2283,23 +2284,23 @@
* @see #changeClass
*/
function menuHide(id) {
- if (!top.frameMenu) {
+ if (!parent.frameMenu) {
window.open(baseFrameServlet, "_blank");
} else {
if (id==null) {
id = 'buttonMenu';
}
- var frame = top.document;
- var frameset = frame.getElementById("framesetMenu");
- if (!frameset) {
+ var frameContainer = getFrame('main');
+ var framesetMenu = frameContainer.document.getElementById("framesetMenu");
+ if (!framesetMenu) {
return false;
}
- if (top.isRTL == true) {
- frameset.cols = "*,0%,0%";
+ if (frameContainer.isRTL == true) {
+ framesetMenu.cols = "*,0%,0%";
} else {
- frameset.cols = "0%,0%,*";
+ framesetMenu.cols = "0%,0%,*";
}
- top.isMenuHide = true;
+ frameContainer.isMenuHide = true;
try {
putFocusOnWindow();
} catch(e) {
@@ -2356,10 +2357,10 @@
}
function getMenuExpandCollapse_status() {
-//
alert(top.frameMenu.getElementById('paramfieldDesplegar').getAttribute('id'));
+//
alert(getFrame('frameMenu').getElementById('paramfieldDesplegar').getAttribute('id'));
var menuExpandCollapse_status;
- if (top.frames['frameMenu'].document.getElementById('paramfieldDesplegar'))
menuExpandCollapse_status = 'collapsed';
- if (top.frames['frameMenu'].document.getElementById('paramfieldContraer'))
menuExpandCollapse_status = 'expanded';
+ if (getFrame('frameMenu').document.getElementById('paramfieldDesplegar'))
menuExpandCollapse_status = 'collapsed';
+ if (getFrame('frameMenu').document.getElementById('paramfieldContraer'))
menuExpandCollapse_status = 'expanded';
return menuExpandCollapse_status;
}
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
