knguyen 2004/11/30 13:37:25 CET
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/views/jsp/jahia/htmleditors/activex activex_htmleditor.jsp
src/views/jsp/jahia/htmleditors/ekit ekit_htmleditor.jsp
src/views/jsp/jahia/htmleditors/eopro eopro_htmleditor.jsp
src/views/jsp/jahia/htmleditors/eopro3 eopro3_htmleditor.jsp
src/views/jsp/jahia/htmleditors/htmlarea
htmlarea_htmleditor.jsp
src/views/jsp/jahia/htmleditors/simpletext
simpletext_htmleditor.jsp
Added files: (Branch: JAHIA-4-0-BRANCH)
src/views/jsp/jahia/htmleditors/eopro4 eopro4_htmleditor.jsp
main.jsp
Log:
- added eopro 4
- fix tabulation
- other small fixes
Revision Changes Path
1.20.2.3 +4 -8
jahia/src/views/jsp/jahia/htmleditors/activex/activex_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/activex/activex_htmleditor.jsp.diff?r1=1.20.2.2&r2=1.20.2.3&f=h
1.10.2.3 +2 -2
jahia/src/views/jsp/jahia/htmleditors/ekit/ekit_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/ekit/ekit_htmleditor.jsp.diff?r1=1.10.2.2&r2=1.10.2.3&f=h
1.12.4.2 +2 -2
jahia/src/views/jsp/jahia/htmleditors/eopro/eopro_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/eopro/eopro_htmleditor.jsp.diff?r1=1.12.4.1&r2=1.12.4.2&f=h
1.15.2.2 +2 -2
jahia/src/views/jsp/jahia/htmleditors/eopro3/eopro3_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/eopro3/eopro3_htmleditor.jsp.diff?r1=1.15.2.1&r2=1.15.2.2&f=h
1.1.2.1 +75 -0
jahia/src/views/jsp/jahia/htmleditors/eopro4/eopro4_htmleditor.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/eopro4/eopro4_htmleditor.jsp?rev=1.1.2.1&content-type=text/plain
1.1.2.1 +127 -0 jahia/src/views/jsp/jahia/htmleditors/eopro4/main.jsp
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/eopro4/main.jsp?rev=1.1.2.1&content-type=text/plain
1.1.2.8 +10 -6
jahia/src/views/jsp/jahia/htmleditors/htmlarea/htmlarea_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/htmlarea_htmleditor.jsp.diff?r1=1.1.2.7&r2=1.1.2.8&f=h
1.4.2.5 +2 -2
jahia/src/views/jsp/jahia/htmleditors/simpletext/simpletext_htmleditor.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/simpletext/simpletext_htmleditor.jsp.diff?r1=1.4.2.4&r2=1.4.2.5&f=h
Index: activex_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/activex/Attic/activex_htmleditor.jsp,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -r1.20.2.2 -r1.20.2.3
--- activex_htmleditor.jsp 4 Oct 2004 17:10:14 -0000 1.20.2.2
+++ activex_htmleditor.jsp 30 Nov 2004 12:37:23 -0000 1.20.2.3
@@ -39,8 +39,8 @@
String theOldField = theField.getValue();
//System.out.println("activex_html.jsp, the oldfield : " + theOldField);
- if ( !theOldField.startsWith("<html>")
- && !theOldField.startsWith("<html>") ){
+ if ( !theOldField.toLowerCase().startsWith("<html>")
+ && !theOldField.toLowerCase().startsWith("<html>") ){
theOldField =
JahiaTools.replacePattern(theOldField,"\n","\n<br/>");
}
@@ -57,12 +57,7 @@
}
}
- //theOldField = JahiaTools.text2html(theOldField);
- // FIXME : why are these changes required ???
- //theOldField = JahiaTools.replacePattern(theOldField,"<","<");
- //theOldField = JahiaTools.replacePattern(theOldField,""","\"");
-
-
+ theOldField = JahiaTools.replacePattern(theOldField,"\t","");
theOldField =
JahiaTools.replacePattern(JahiaTools.javaSpecialChars(theOldField),"\"","\\\"");
theOldField = JahiaTools.replacePattern(theOldField,"'","\\'");
@@ -232,6 +227,7 @@
var val = "<%=theOldField%>";
val = val.replace(/\\r/g,'\r');
val = val.replace(/\\n/g,'\n');
+ val = val.replace(/\\t,' ');
theOldValue = val;
if (screen.height < 769) {
document.body.style.overflowX = "hidden";
Index: ekit_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/ekit/Attic/ekit_htmleditor.jsp,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- ekit_htmleditor.jsp 23 Aug 2004 14:48:56 -0000 1.10.2.2
+++ ekit_htmleditor.jsp 30 Nov 2004 12:37:23 -0000 1.10.2.3
@@ -24,8 +24,8 @@
String theOldField = theField.getValue();
String theNewField = "";
- if ( !theOldField.startsWith("<html>")
- && !theOldField.startsWith("<html>") ){
+ if ( !theOldField.toLowerCase().startsWith("<html>")
+ && !theOldField.toLowerCase().startsWith("<html>") ){
theOldField =
JahiaTools.replacePattern(theOldField,"\r\n","<br>");
}
Index: eopro_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/eopro/Attic/eopro_htmleditor.jsp,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -u -r1.12.4.1 -r1.12.4.2
--- eopro_htmleditor.jsp 6 Aug 2004 18:01:18 -0000 1.12.4.1
+++ eopro_htmleditor.jsp 30 Nov 2004 12:37:23 -0000 1.12.4.2
@@ -24,8 +24,8 @@
String theOldField =
FormDataManager.getInstance().formDecode(theField.getValue());
String theNewField = "";
- if ( !theOldField.startsWith("<html>")
- && !theOldField.startsWith("<html>") ){
+ if ( !theOldField.toLowerCase().startsWith("<html>")
+ && !theOldField.toLowerCase().startsWith("<html>") ){
theOldField =
JahiaTools.replacePattern(theOldField,"\r\n","<br/>");
}
Index: eopro3_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/eopro3/Attic/eopro3_htmleditor.jsp,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- eopro3_htmleditor.jsp 6 Aug 2004 18:01:18 -0000 1.15.2.1
+++ eopro3_htmleditor.jsp 30 Nov 2004 12:37:24 -0000 1.15.2.2
@@ -28,8 +28,8 @@
theOldField = JahiaTools.replacePattern(theOldField,">\n",">");
- if ( !theOldField.startsWith("<html>")
- && !theOldField.startsWith("<html>") ){
+ if ( !theOldField.toLowerCase().startsWith("<html>")
+ && !theOldField.toLowerCase().startsWith("<html>") ){
theOldField =
JahiaTools.replacePattern(theOldField,"\n","<br/>");
}
Index: htmlarea_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/htmlarea/Attic/htmlarea_htmleditor.jsp,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- htmlarea_htmleditor.jsp 10 Nov 2004 19:07:29 -0000 1.1.2.7
+++ htmlarea_htmleditor.jsp 30 Nov 2004 12:37:24 -0000 1.1.2.8
@@ -10,6 +10,7 @@
<jahia:i18n />
<%
HashMap engineMap = (HashMap) request.getAttribute(
"org.jahia.engines.EngineHashMap" );
+ String languageCode = (String) engineMap.get( "languageCode" );
JahiaField theField = (JahiaField) engineMap.get( "theField"
);
ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
@@ -27,8 +28,8 @@
theOldField = JahiaTools.replacePattern(theOldField,">\n",">");
- if ( !theOldField.startsWith("<html>")
- && !theOldField.startsWith("<html>") ){
+ if ( !theOldField.toLowerCase().startsWith("<html>")
+ && !theOldField.toLowerCase().startsWith("<html>") ){
theOldField =
JahiaTools.replacePattern(theOldField,"\n","<br/>");
}
@@ -51,7 +52,7 @@
theOldField = "<html><body></body></html>";
}
- String editorLang = jParams.getLocale().toString();
+ String editorLang = languageCode;
// check that the resource exist in this lang
// String[] langs =
{"b5","cz","da","de","ee","el","en","es","fi","fr","gb","he","hu","it","ja-euc","ja-jis","ja-utf8","it","lv","nb","no","pl","pt_br","ro","ru","se","si","vn"};
String[] langs = {"de","en","es","fr","it"};
@@ -192,10 +193,13 @@
}
function getHtmlEditorText(jahiaTextHiddenInput){
- if ( editor != null ){
- jahiaTextHiddenInput.value = editor.getHTML();
+ try {
+ if ( editor != null ){
+ jahiaTextHiddenInput.value = editor.getHTML();
+ }
+ } catch (e){
}
- if ( jahiaTextHiddenInput.value.indexOf("<html>",0)==-1 ){
+ if ( jahiaTextHiddenInput.value.toLowerCase().indexOf("<html>",0)==-1 ){
jahiaTextHiddenInput.value = "<html>" +
jahiaTextHiddenInput.value + "</html>";
}
}
Index: simpletext_htmleditor.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/simpletext/Attic/simpletext_htmleditor.jsp,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- simpletext_htmleditor.jsp 6 Aug 2004 18:01:18 -0000 1.4.2.4
+++ simpletext_htmleditor.jsp 30 Nov 2004 12:37:24 -0000 1.4.2.5
@@ -20,8 +20,8 @@
String theOldField = theField.getValue();
String theNewField = "";
- if ( !theOldField.startsWith("<html>")
- && !theOldField.startsWith("<html>") ){
+ if ( !theOldField.toLowerCase().startsWith("<html>")
+ && !theOldField.toLowerCase().startsWith("<html>") ){
theOldField =
JahiaTools.replacePattern(theOldField,"\r\n","<br/>");
}
