Author: xlawrence
Date: Wed Jun 27 16:24:16 2007
New Revision: 17797
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17797&repname=
=3Djahia
Log:
backport fix on work in progress window not closing properly under IE 6
Modified:
trunk/core/src/webapp/jsp/jahia/javascript/jahia.js
Modified: trunk/core/src/webapp/jsp/jahia/javascript/jahia.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/javascript/jahia.js&rev=3D17797&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/javascript/jahia.js (original)
+++ trunk/core/src/webapp/jsp/jahia/javascript/jahia.js Wed Jun 27 16:24:16=
2007
@@ -32,6 +32,7 @@
// global popup
var myEngineWin =3D null;
var pickerlist =3D null;
+var workInProgress =3D null;
var GlobalCallbackCount =3D 0;
var GlobalCallback =3D new Array();
var GlobalListenerCount =3D 0;
@@ -170,7 +171,7 @@
var theUrl =3D httpServerPath;
theUrl +=3D "/jsp/jahia/administration/work_in_progress.html";
//var workInProgressWin =3D window.open( theUrl, "workInProgressWin", =
params );
- window.open(theUrl, "workInProgressWin", params);
+ workInProgress =3D window.open(theUrl, "workInProgressWin", params);
=
}
// openWorkInProgressWindow
@@ -267,24 +268,13 @@
=
=
// CloseJahiaWindow - added for deleting current site to display paren=
tsite after delete
- function CloseJahiaWindowWithUrl(newUrl)
- {
- var theMatrix =3D Math.round(Math.random() * 10000);
-
- if (newUrl.indexOf("?") !=3D -1)
- newUrl =3D newUrl + "&matrix=3D" + theMatrix;
- else newUrl =3D newUrl + "?matrix=3D" + theMatrix;
-
+ function CloseJahiaWindowWithUrl(newUrl) {
//alert( "Rereshing window with url :\n" + newUrl );
-
- window.opener.location.href =3D newUrl + "&matrix=3D" + theMatrix;
+ window.opener.location.href =3D newUrl;
oldLoc =3D window.opener.location;
WaitForRefresh();
-
} // end CloseJahiaWindow
=
-
-
// saveAndAddNew
function saveAndAddNew(url, refreshOpener) {
var engineWin =3D window.opener.myEngineWin;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
