mcardle 2005/08/30 18:48:02 CEST
Modified files:
core/src/java/components/guestbook GuestBookApp.java
core/src/java/org/jahia/bin AdminAction.java
core/src/java/org/jahia/data/fields JahiaBigTextField.java
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
core/src/java/org/jahia/params ParamBean.java
ProcessingContext.java
core/src/webapp/jsp/jahia/administration
extdep_site_extractconfirmation.jsp
extdep_site_flush.jsp
extdep_site_restoreconfirmation.jsp
manage_templates.jsp
core/src/webapp/jsp/jahia/administration/homepages main.jsp
core/src/webapp/jsp/jahia/administration/search main.jsp
core/src/webapp/jsp/jahia/engines/audit sendlogs.jsp
core/src/webapp/jsp/jahia/engines/filemanager view.jsp
core/src/webapp/jsp/jahia/engines/shared
embedded_filemanager.jsp
embedded_flat_filemanager.jsp
file_field.jsp
core/src/webapp/jsp/jahia/engines/sites sites_launcher.jsp
core/src/webapp/jsp/jahia/engines/updatefield updatefield.jsp
core/src/webapp/jsp/jahia/javascript jahia.js
Log:
removed 'matrix' URL parameter
Revision Changes Path
1.3 +1 -2
jahia/core/src/java/components/guestbook/GuestBookApp.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/components/guestbook/GuestBookApp.java.diff?r1=1.2&r2=1.3&f=h
1.4 +1 -1 jahia/core/src/java/org/jahia/bin/AdminAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/AdminAction.java.diff?r1=1.3&r2=1.4&f=h
1.22 +1 -5
jahia/core/src/java/org/jahia/data/fields/JahiaBigTextField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/fields/JahiaBigTextField.java.diff?r1=1.21&r2=1.22&f=h
1.12 +1 -1
jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java.diff?r1=1.11&r2=1.12&f=h
1.32 +1 -8 jahia/core/src/java/org/jahia/params/ParamBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/params/ParamBean.java.diff?r1=1.31&r2=1.32&f=h
1.5 +1 -8
jahia/core/src/java/org/jahia/params/ProcessingContext.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/params/ProcessingContext.java.diff?r1=1.4&r2=1.5&f=h
1.2 +2 -4
jahia/core/src/webapp/jsp/jahia/administration/extdep_site_extractconfirmation.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/extdep_site_extractconfirmation.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -3
jahia/core/src/webapp/jsp/jahia/administration/extdep_site_flush.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/extdep_site_flush.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -4
jahia/core/src/webapp/jsp/jahia/administration/extdep_site_restoreconfirmation.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/extdep_site_restoreconfirmation.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -3
jahia/core/src/webapp/jsp/jahia/administration/homepages/main.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/homepages/main.jsp.diff?r1=1.1&r2=1.2&f=h
1.3 +1 -3
jahia/core/src/webapp/jsp/jahia/administration/manage_templates.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/manage_templates.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -3
jahia/core/src/webapp/jsp/jahia/administration/search/main.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/search/main.jsp.diff?r1=1.2&r2=1.3&f=h
1.2 +2 -2
jahia/core/src/webapp/jsp/jahia/engines/audit/sendlogs.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/audit/sendlogs.jsp.diff?r1=1.1&r2=1.2&f=h
1.6 +1 -2
jahia/core/src/webapp/jsp/jahia/engines/filemanager/view.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/filemanager/view.jsp.diff?r1=1.5&r2=1.6&f=h
1.4 +1 -2
jahia/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp.diff?r1=1.3&r2=1.4&f=h
1.11 +1 -2
jahia/core/src/webapp/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp.diff?r1=1.10&r2=1.11&f=h
1.4 +1 -2
jahia/core/src/webapp/jsp/jahia/engines/shared/file_field.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/shared/file_field.jsp.diff?r1=1.3&r2=1.4&f=h
1.3 +1 -1
jahia/core/src/webapp/jsp/jahia/engines/sites/sites_launcher.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/sites/sites_launcher.jsp.diff?r1=1.2&r2=1.3&f=h
1.6 +0 -1
jahia/core/src/webapp/jsp/jahia/engines/updatefield/updatefield.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/updatefield/updatefield.jsp.diff?r1=1.5&r2=1.6&f=h
1.3 +18 -51 jahia/core/src/webapp/jsp/jahia/javascript/jahia.js
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/javascript/jahia.js.diff?r1=1.2&r2=1.3&f=h
Index: GuestBookApp.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/components/guestbook/GuestBookApp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GuestBookApp.java 5 Jul 2005 15:41:51 -0000 1.2
+++ GuestBookApp.java 30 Aug 2005 16:47:58 -0000 1.3
@@ -223,9 +223,8 @@
String flushField = "";
if (jParams.getOperationMode() == ProcessingContext.EDIT) {
- int matrix = (int)(Math.random() * 10000);
flushField += "<input type=\"button\" name=\"flush\"
value=\"Flush Entries\" ";
- flushField += "onClick=\"location.href='" +
response.encodeURL(actionURL + "?gb_flush=true&matrix=" + matrix ) + "'\">\n";
+ flushField += "onClick=\"location.href='" +
response.encodeURL(actionURL + "?gb_flush=true" ) + "'\">\n";
}
Hashtable tokens = new Hashtable();
Index: AdminAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/AdminAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AdminAction.java 5 Jul 2005 15:45:56 -0000 1.3
+++ AdminAction.java 30 Aug 2005 16:47:58 -0000 1.4
@@ -92,7 +92,7 @@
// response no-cache headers...
response.setHeader("Pragma", "no-cache");
- response.setHeader("Cache-Control", "no-cache");
+ //response.setHeader("Cache-Control", "no-cache");
response.setDateHeader("Expires", 0);
JahiaData jData =
(JahiaData)request.getAttribute("org.jahia.data.JahiaData");
Index: JahiaBigTextField.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/fields/JahiaBigTextField.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JahiaBigTextField.java 2 Aug 2005 13:31:56 -0000 1.21
+++ JahiaBigTextField.java 30 Aug 2005 16:47:58 -0000 1.22
@@ -519,11 +519,7 @@
}
// Get rid of all what is unecessary after the /pid/
- // (matrix, jSessionId)
- if (link.indexOf("?matrix") > -1) {
- link = link.substring(0, link.indexOf("?matrix"));
- }
-
+ // (jSessionId)
if (link.indexOf(";jsessionid") > -1) {
link = link.substring(0, link.indexOf(";jsessionid"));
}
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ManageContentPicker.java 29 Aug 2005 09:20:16 -0000 1.11
+++ ManageContentPicker.java 30 Aug 2005 16:47:58 -0000 1.12
@@ -351,7 +351,7 @@
} else {
ie.copy(source, object, jParams,
EntryLoadRequest.CURRENT);
}
- engineMap.put("contentpick_engine.fieldForm", "<script
language=\"javascript\">window.opener.location.href =
defineMatrixParam(window.opener.location.href);window.close();</script>");
+ engineMap.put("contentpick_engine.fieldForm", "<script
language=\"javascript\">window.close();</script>");
} catch (JahiaException e) {
e.printStackTrace(); //To change body of catch statement
use File | Settings | File Templates.
} catch (NumberFormatException e) {
Index: ParamBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ParamBean.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ParamBean.java 25 Aug 2005 18:29:17 -0000 1.31
+++ ParamBean.java 30 Aug 2005 16:47:59 -0000 1.32
@@ -2360,14 +2360,7 @@
}
}
theUrl.append(params);
- } else {
- if (theUrl.toString().indexOf("?") == -1) {
- theUrl.append("?matrix=");
- } else {
- theUrl.append("&matrix=");
- }
- theUrl.append(String.valueOf(System.currentTimeMillis()));
- }
+ }
}
Index: ProcessingContext.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ProcessingContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProcessingContext.java 25 Aug 2005 18:29:17 -0000 1.4
+++ ProcessingContext.java 30 Aug 2005 16:47:59 -0000 1.5
@@ -2179,14 +2179,7 @@
}
}
theUrl.append(params);
- } else {
- if (theUrl.toString().indexOf("?") == -1) {
- theUrl.append("?matrix=");
- } else {
- theUrl.append("&matrix=");
- }
- theUrl.append(String.valueOf(System.currentTimeMillis()));
- }
+ }
}
Index: extdep_site_extractconfirmation.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/extdep_site_extractconfirmation.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extdep_site_extractconfirmation.jsp 30 Mar 2004 14:14:22 -0000
1.1
+++ extdep_site_extractconfirmation.jsp 30 Aug 2005 16:47:59 -0000
1.2
@@ -14,9 +14,7 @@
String jahiaExtractName = (String)
request.getAttribute("jahiaExtractName");
String jahiaExtractDesc = (String)
request.getAttribute("jahiaExtractDesc");
- Random rd = new Random();
- String theMatrix = Long.toString(rd.nextLong());
-
+
%>
@@ -30,7 +28,7 @@
<tr>
<td colspan="2" width="530"> </td>
</tr>
- <form name="jahiaAdmin"
action='<%=JahiaAdministration.composeActionURL(request,response,"extdepsite","&sub=extract&matrix="
+ theMatrix)%>' method="post">
+ <form name="jahiaAdmin"
action='<%=JahiaAdministration.composeActionURL(request,response,"extdepsite","&sub=extract")%>'
method="post">
<tr>
<td width="100"> </td>
<td width="430">
Index: extdep_site_flush.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/extdep_site_flush.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extdep_site_flush.jsp 30 Mar 2004 14:14:22 -0000 1.1
+++ extdep_site_flush.jsp 30 Aug 2005 16:47:59 -0000 1.2
@@ -10,8 +10,6 @@
extractName = seBean.getName();
}
- Random rd = new Random();
-
%>
@@ -118,7 +116,7 @@
<td nowrap width="145" valign="top"><font
class="text"><b><jahia:adminResourceBundle
resourceName="org.jahia.admin.otherOperations.label"/> : </b></font></td>
<td valign="top">
<font class="text">
- <%if(!isLynx){%><li> <%}%><a
href='<%=JahiaAdministration.composeActionURL(request,response,"extdepsite","&sub=extractlist&matrix="
+ rd.nextLong())%>'><jahia:adminResourceBundle
resourceName="org.jahia.admin.sites.ExtractDeploySite.backToExtractionsList.label"/></a><br>
+ <%if(!isLynx){%><li> <%}%><a
href='<%=JahiaAdministration.composeActionURL(request,response,"extdepsite","&sub=extractlist"
)%>'><jahia:adminResourceBundle
resourceName="org.jahia.admin.sites.ExtractDeploySite.backToExtractionsList.label"/></a><br>
<%if(!isLynx){%><li> <%}%><a
href='<%=JahiaAdministration.composeActionURL(request,response,"displaymenu","")%>'><jahia:adminResourceBundle
resourceName="org.jahia.admin.backToMenu.label"/></a><br>
</font>
</td>
Index: extdep_site_restoreconfirmation.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/extdep_site_restoreconfirmation.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extdep_site_restoreconfirmation.jsp 30 Mar 2004 14:14:22 -0000
1.1
+++ extdep_site_restoreconfirmation.jsp 30 Aug 2005 16:47:59 -0000
1.2
@@ -17,9 +17,6 @@
selSiteKeys = new Vector();
}
- Random rd = new Random();
- String theMatrix = Long.toString(rd.nextLong());
-
%>
@@ -33,7 +30,7 @@
<tr>
<td colspan="2" width="530"> </td>
</tr>
- <form name="jahiaAdmin"
action='<%=JahiaAdministration.composeActionURL(request,response,"extdepsite","&sub=restore&matrix="
+ theMatrix)%>' method="post">
+ <form name="jahiaAdmin"
action='<%=JahiaAdministration.composeActionURL(request,response,"extdepsite","&sub=restore"
)%>' method="post">
<tr>
<td width="100"> </td>
Index: manage_templates.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/manage_templates.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- manage_templates.jsp 5 Jul 2005 15:46:45 -0000 1.2
+++ manage_templates.jsp 30 Aug 2005 16:47:59 -0000 1.3
@@ -84,9 +84,7 @@
function submitFormular(sub,go)
{
- var theMatrix = Math.round(Math.random() * 10000);
-
-
document.mainForm.action='<%=requestURI%>?do=templates&sub='+sub+'&subaction='+go+'&matrix='+theMatrix;
+
document.mainForm.action='<%=requestURI%>?do=templates&sub='+sub+'&subaction='+go;
document.mainForm.method='POST';
document.mainForm.submit();
}
Index: main.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/homepages/main.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- main.jsp 30 Mar 2004 14:14:22 -0000 1.1
+++ main.jsp 30 Aug 2005 16:47:59 -0000 1.2
@@ -62,9 +62,7 @@
function submitFormular(sub,go)
{
- var theMatrix = Math.round(Math.random() * 10000);
-
-
document.formular.action='<%=JahiaAdministration.composeActionURL(request,response,"homepages","&sub=")%>'+sub+'&go='+go+'&matrix='+theMatrix;
+
document.formular.action='<%=JahiaAdministration.composeActionURL(request,response,"homepages","&sub=")%>'+sub+'&go='+go;
document.formular.method='POST';
document.formular.submit();
}
Index: main.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/search/main.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main.jsp 5 Jul 2005 15:46:45 -0000 1.2
+++ main.jsp 30 Aug 2005 16:48:00 -0000 1.3
@@ -57,9 +57,7 @@
function submitFormular(sub,go)
{
- var theMatrix = Math.round(Math.random() * 10000);
-
-
document.formular.action='<%=JahiaAdministration.composeActionURL(request,response,"search","&sub=")%>'+sub+'&go='+go+'&matrix='+theMatrix;
+
document.formular.action='<%=JahiaAdministration.composeActionURL(request,response,"search","&sub=")%>'+sub+'&go='+go;
document.formular.method='POST';
//safeSubmit(document.formular);
document.formular.submit();
Index: sendlogs.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/audit/sendlogs.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sendlogs.jsp 30 Mar 2004 14:14:22 -0000 1.1
+++ sendlogs.jsp 30 Aug 2005 16:48:00 -0000 1.2
@@ -8,8 +8,8 @@
response.setHeader("Content-disposition", "filename=jahia_log.txt");
response.setHeader("Content-type", "application/octetstream");
response.setHeader("Pragma", "no-cache");
- response.setHeader("Expires", "0");
-%>
+ response.setHeader("Expires", "-1");
+ %>
<%
for(int i=0; i < logData.size(); i++) {
Index: view.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/filemanager/view.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- view.jsp 30 Aug 2005 14:28:06 -0000 1.5
+++ view.jsp 30 Aug 2005 16:48:00 -0000 1.6
@@ -90,8 +90,7 @@
var name="jahiaApplicationManagerPopup";
url = "<%= fileeditUrl %>?screen=edit&path=" + path;
- var theMatrix = Math.round(Math.random() * 10000);
- var newURL = url + "&matrix=" + theMatrix;
+ var newURL = url;
var myWin = window.open( newURL, name, params );
}
Index: embedded_filemanager.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- embedded_filemanager.jsp 5 Jul 2005 15:46:47 -0000 1.3
+++ embedded_filemanager.jsp 30 Aug 2005 16:48:01 -0000 1.4
@@ -73,8 +73,7 @@
<%-- for (i = 0; i < <%= dirEntries.size()%>; i++) {--%>
<%-- url = url + document.mainForm["selected"+i].value;--%>
<%-- }--%>
- var theMatrix = Math.round(Math.random() * 10000);
- var newURL = url + "&matrix=" + theMatrix;
+ var newURL = url ;
var myWin = window.open( newURL, name, params );
}
Index: embedded_flat_filemanager.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- embedded_flat_filemanager.jsp 24 Aug 2005 16:25:16 -0000 1.10
+++ embedded_flat_filemanager.jsp 30 Aug 2005 16:48:01 -0000 1.11
@@ -80,8 +80,7 @@
<%-- for (i = 0; i < <%= dirEntries.size()%>; i++) {--%>
<%-- url = url + document.mainForm["selected"+i].value;--%>
<%-- }--%>
- var theMatrix = Math.round(Math.random() * 10000);
- var newURL = url + "&matrix=" + theMatrix;
+ var newURL = url ;
var myWin = window.open( newURL, name, params );
}
Index: file_field.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/shared/file_field.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- file_field.jsp 6 Aug 2004 19:39:41 -0000 1.3
+++ file_field.jsp 30 Aug 2005 16:48:01 -0000 1.4
@@ -50,8 +50,7 @@
var name="<jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.File_Field.jahiaFileManagerPopup.label"/>";
url += "&fileItem=" +
document.mainForm.file_id.options[document.mainForm.file_id.selectedIndex].value
;
- var theMatrix = Math.round(Math.random() * 10000);
- var newURL = url + "&matrix=" + theMatrix;
+ var newURL = url;
var myWin = window.open( newURL, name, params );
}
Index: sites_launcher.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/sites/sites_launcher.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sites_launcher.jsp 6 Aug 2004 19:39:42 -0000 1.2
+++ sites_launcher.jsp 30 Aug 2005 16:48:01 -0000 1.3
@@ -44,7 +44,7 @@
var params = "width=" + width + ",height=" + height +
",resizable=1,scrollbars=1,status=1,dependent=0";
- var name = "jahiasite_" + Math.round(Math.random() * 10000);
+ var name = "jahiasite_" + Math.round(Math.random() * 10000);
//TODO: Remove?
delCookie('<%=idName%>');
Index: updatefield.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/updatefield/updatefield.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- updatefield.jsp 17 Dec 2004 16:09:19 -0000 1.5
+++ updatefield.jsp 30 Aug 2005 16:48:02 -0000 1.6
@@ -26,7 +26,6 @@
JahiaField theField = (JahiaField) engineMap.get( "theField" );
ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
EngineLanguageHelper elh =
(EngineLanguageHelper)engineMap.get(JahiaEngine.ENGINE_LANGUAGE_HELPER);
-
%>
<%
Index: jahia.js
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/javascript/jahia.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jahia.js 30 Aug 2005 12:18:10 -0000 1.2
+++ jahia.js 30 Aug 2005 16:48:02 -0000 1.3
@@ -8,7 +8,7 @@
// of any page from which engine
popup can be launched.
// This ensure that when the page
is closed or unloaded,any engine popup that is left open is closed !!!!
// Whitout that, more than one
engine can be left open and this means -> possible engine session conflict !!!!
-//
+// MC 30.08.2005 Removed matrix param
// global popup
@@ -23,26 +23,23 @@
} else {
params = "width=" + width + ",height=" + height +
",resizable=yes,scrollbars=no,status=no";
}
- var theMatrix = Math.round(Math.random() * 10000);
-
- var newURL = url + "&matrix=" + theMatrix;
// Hollis : check if the popup is alread opened, if so, give it the
focus
if ( myEngineWin != null ){
if ( myEngineWin.closed ){ // need to test it first...
myEngineWin = null;
- myEngineWin = window.open( newURL, name, params );
+ myEngineWin = window.open( url, name, params );
} else {
if ( myEngineWin.name != name ){
myEngineWin.close();
myEngineWin = null;
- myEngineWin = window.open( newURL, name, params );
+ myEngineWin = window.open( url, name, params );
} else {
myEngineWin.focus();
}
}
} else {
- myEngineWin = window.open( newURL, name, params );
+ myEngineWin = window.open( url, name, params );
}
} // end OpenJahiaWindow
@@ -54,25 +51,22 @@
var params = "width=" + width + ",height=" + height +
",resizable=1,scrollbars=1,status=0";
- var theMatrix = Math.round(Math.random() * 10000);
- var newURL = url + "&matrix=" + theMatrix;
-
// Check if the popup is alread opened, if so, give it the focus
if ( myEngineWin != null ){
if ( myEngineWin.closed ){ // need to test it first...
myEngineWin = null;
- myEngineWin = window.open( newURL, name, params );
+ myEngineWin = window.open( url, name, params );
} else {
if ( myEngineWin.name != name ){
myEngineWin.close();
myEngineWin = null;
- myEngineWin = window.open( newURL, name, params );
+ myEngineWin = window.open( url, name, params );
} else {
myEngineWin.focus();
}
}
} else {
- myEngineWin = window.open( newURL, name, params );
+ myEngineWin = window.open( url, name, params );
}
@@ -110,10 +104,9 @@
var params =
"width=200,height=200,resizable=0,scrollbars=0,status=0";
- var theMatrix = Math.round(Math.random() * 10000);
var theUrl = httpServerPath;
- theUrl += "/jsp/jahia/administration/work_in_progress.html" +
"?matrix=" + theMatrix;
+ theUrl += "/jsp/jahia/administration/work_in_progress.html" ;
//var workInProgressWin = window.open( theUrl, "workInProgressWin",
params );
myEngineWin = window.open( theUrl, "workInProgressWin", params );
@@ -130,11 +123,7 @@
if (CloseJahiaWindow.arguments.length > 0) {
params = CloseJahiaWindow.arguments[0];
}
- var theMatrix = Math.round(Math.random() * 10000);
var oldUrl = window.opener.location.href;
- if (oldUrl.indexOf("matrix") != -1) {
- oldUrl = oldUrl.substring( 0, oldUrl.indexOf("matrix")-1 );
- }
var pos = oldUrl.indexOf("&engine_params");
if (pos != -1) {
oldUrl = oldUrl.substring( 0, pos );
@@ -153,12 +142,12 @@
if (oldUrl.indexOf("?") != -1) {
- newUrl = oldUrl + "&matrix=" + theMatrix;
+ newUrl = oldUrl ;
if ( pos2 != -1 ){
newUrl = newUrl + anchorVal;
}
} else {
- newUrl = oldUrl + "?matrix=" + theMatrix;
+ newUrl = oldUrl ;
if ( pos2 != -1 ){
newUrl = newUrl + anchorVal;
}
@@ -190,10 +179,10 @@
{
var engineWin = window.opener.myEngineWin;
window.opener.myEngineWin = null;
- window.location.href = defineMatrixParam(url);
- if ( refreshOpener == "yes" ){
- window.opener.location.href =
defineMatrixParam(window.opener.location.href);
- }
+ window.location.href = url;
+ //if ( refreshOpener == "yes" ){
+ //window.opener.location.href =
defineMatrixParam(window.opener.location.href);
+ //}
oldLoc = window.opener.location;
while( window.opener.location != null
&& (oldLoc != window.opener.location) ){
@@ -208,8 +197,7 @@
{
var oldEngine = window.opener.myEngineWin;
window.opener.myEngineWin = null;
- window.location.href = defineMatrixParam(url);
- window.opener.location.href =
defineMatrixParam(window.opener.location.href);
+ window.location.href = url;
// Skip temporary while netscape does no work.
var browser = navigator.appName;
if (browser.indexOf("Netscape") != -1) {
@@ -225,27 +213,6 @@
window.opener.myEngineWin = oldEngine;
}
- // defineMatrixParam
- function defineMatrixParam(url)
- {
- var newUrl = url;
- var endUrl = "";
- var matrixPos = url.indexOf("matrix=");
- if (matrixPos != -1) {
- newUrl = url.substring(0, matrixPos);
- var i = matrixPos;
- for (; i < url.length && url.charAt(i) != "&"; i++);
- endUrl = url.substr(i);
- } else if (newUrl.indexOf("?") == -1) {
- newUrl += "?";
- } else {
- newUrl += "&";
- }
-
- newUrl += "matrix=" + Math.round(Math.random() * 10000) + endUrl;
- //alert(newUrl);
- return newUrl;
- }
// closePopupWindow
function closePopupWindow()
@@ -271,7 +238,7 @@
theUrl += "?" + params;
}
}
- window.opener.location.href = defineMatrixParam(theUrl);
+ window.opener.location.href = theUrl;
}
}
window.close();
@@ -295,10 +262,10 @@
theUrl += "?" + openerUrlParams;
}
}
- window.opener.location.href = defineMatrixParam(theUrl);
+ window.opener.location.href = theUrl;
WaitForRefresh();
}
- window.location.href = defineMatrixParam(popupNewUrl);
+ window.location.href = popupNewUrl;
}
// WaitForRefresh (called by CloseJahiaWindow)
