knguyen 2004/12/01 12:28:41 CET
Modified files:
core/src/webapp/jsp/jahia/htmleditors/activex
activex_htmleditor.jsp
core/src/webapp/jsp/jahia/htmleditors/ekit ekit_htmleditor.jsp
core/src/webapp/jsp/jahia/htmleditors/eopro3
eopro3_htmleditor.jsp
core/src/webapp/jsp/jahia/htmleditors/eopro4
eopro4_htmleditor.jsp
core/src/webapp/jsp/jahia/htmleditors/htmlarea
htmlarea_htmleditor.jsp
Log:
- merge fix
Revision Changes Path
1.5 +1 -0
jahia/core/src/webapp/jsp/jahia/htmleditors/activex/activex_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/htmleditors/activex/activex_htmleditor.jsp.diff?r1=1.4&r2=1.5&f=h
1.4 +2 -1
jahia/core/src/webapp/jsp/jahia/htmleditors/ekit/ekit_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/htmleditors/ekit/ekit_htmleditor.jsp.diff?r1=1.3&r2=1.4&f=h
1.4 +2 -1
jahia/core/src/webapp/jsp/jahia/htmleditors/eopro3/eopro3_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/htmleditors/eopro3/eopro3_htmleditor.jsp.diff?r1=1.3&r2=1.4&f=h
1.2 +2 -1
jahia/core/src/webapp/jsp/jahia/htmleditors/eopro4/eopro4_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/htmleditors/eopro4/eopro4_htmleditor.jsp.diff?r1=1.1&r2=1.2&f=h
1.4 +2 -1
jahia/core/src/webapp/jsp/jahia/htmleditors/htmlarea/htmlarea_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/htmleditors/htmlarea/htmlarea_htmleditor.jsp.diff?r1=1.3&r2=1.4&f=h
Index: activex_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/htmleditors/activex/activex_htmleditor.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- activex_htmleditor.jsp 30 Nov 2004 12:48:47 -0000 1.4
+++ activex_htmleditor.jsp 1 Dec 2004 11:28:40 -0000 1.5
@@ -8,6 +8,7 @@
<%
HashMap engineMap = (HashMap) request.getAttribute(
"org.jahia.engines.EngineHashMap" );
+ String fieldsEditCallingEngineName = (String) engineMap.get(
"fieldsEditCallingEngineName" );
JahiaField theField = (JahiaField) engineMap.get( "theField" );
ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
Index: ekit_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/htmleditors/ekit/ekit_htmleditor.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ekit_htmleditor.jsp 30 Nov 2004 12:48:47 -0000 1.3
+++ ekit_htmleditor.jsp 1 Dec 2004 11:28:40 -0000 1.4
@@ -11,11 +11,12 @@
<%
HashMap engineMap = (HashMap) request.getAttribute(
"org.jahia.engines.EngineHashMap" );
+ String fieldsEditCallingEngineName = (String) engineMap.get(
"fieldsEditCallingEngineName" );
JahiaField theField = (JahiaField) engineMap.get( "theField"
);
ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
String theURL = (String)
jParams.settings().getJahiaEnginesHttpPath();
- Boolean isSelectedField = (Boolean) engineMap.get(
"isSelectedField" );
+ Boolean isSelectedField = (Boolean) engineMap.get(
fieldsEditCallingEngineName + "." +"isSelectedField" );
boolean isMac = (request.getHeader( "user-agent"
).toUpperCase().indexOf("MAC") != -1);
boolean isMozilla = (request.getHeader( "user-agent"
).toUpperCase().indexOf("MOZILLA") != -1);
Index: eopro3_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/htmleditors/eopro3/eopro3_htmleditor.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eopro3_htmleditor.jsp 30 Nov 2004 12:48:48 -0000 1.3
+++ eopro3_htmleditor.jsp 1 Dec 2004 11:28:41 -0000 1.4
@@ -11,11 +11,12 @@
<%
HashMap engineMap = (HashMap) request.getAttribute(
"org.jahia.engines.EngineHashMap" );
+ String fieldsEditCallingEngineName = (String) engineMap.get(
"fieldsEditCallingEngineName" );
JahiaField theField = (JahiaField) engineMap.get( "theField"
);
ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
String theURL = (String)
jParams.settings().getJahiaEnginesHttpPath();
- Boolean isSelectedField = (Boolean) engineMap.get(
"isSelectedField" );
+ Boolean isSelectedField = (Boolean) engineMap.get(
fieldsEditCallingEngineName + "." +"isSelectedField" );
boolean isMac = (request.getHeader( "user-agent"
).toUpperCase().indexOf("MAC") != -1);
boolean isMozilla = (request.getHeader( "user-agent"
).toUpperCase().indexOf("MOZILLA") != -1);
Index: eopro4_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/htmleditors/eopro4/eopro4_htmleditor.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eopro4_htmleditor.jsp 30 Nov 2004 12:48:48 -0000 1.1
+++ eopro4_htmleditor.jsp 1 Dec 2004 11:28:41 -0000 1.2
@@ -11,11 +11,12 @@
<%
HashMap engineMap = (HashMap) request.getAttribute(
"org.jahia.engines.EngineHashMap" );
+ String fieldsEditCallingEngineName = (String) engineMap.get(
"fieldsEditCallingEngineName" );
JahiaField theField = (JahiaField) engineMap.get( "theField"
);
ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
String theURL = (String)
jParams.settings().getJahiaEnginesHttpPath();
- Boolean isSelectedField = (Boolean) engineMap.get(
"isSelectedField" );
+ Boolean isSelectedField = (Boolean) engineMap.get(
fieldsEditCallingEngineName + "." +"isSelectedField" );
boolean isMac = (request.getHeader( "user-agent"
).toUpperCase().indexOf("MAC") != -1);
boolean isMozilla = (request.getHeader( "user-agent"
).toUpperCase().indexOf("MOZILLA") != -1);
Index: htmlarea_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/htmleditors/htmlarea/htmlarea_htmleditor.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- htmlarea_htmleditor.jsp 30 Nov 2004 12:48:48 -0000 1.3
+++ htmlarea_htmleditor.jsp 1 Dec 2004 11:28:41 -0000 1.4
@@ -11,11 +11,12 @@
<%
HashMap engineMap = (HashMap) request.getAttribute(
"org.jahia.engines.EngineHashMap" );
String languageCode = (String) engineMap.get( "languageCode" );
+ String fieldsEditCallingEngineName = (String) engineMap.get(
"fieldsEditCallingEngineName" );
JahiaField theField = (JahiaField) engineMap.get( "theField"
);
ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
String theURL = (String)
jParams.settings().getJahiaEnginesHttpPath();
- Boolean isSelectedField = (Boolean) engineMap.get(
"isSelectedField" );
+ Boolean isSelectedField = (Boolean) engineMap.get(
fieldsEditCallingEngineName + "." +"isSelectedField" );
boolean isMac = (request.getHeader( "user-agent"
).toUpperCase().indexOf("MAC") != -1);
boolean isMozilla = (request.getHeader( "user-agent"
).toUpperCase().indexOf("MOZILLA") != -1);
