Author: sshyrkov Date: Fri Oct 5 15:19:39 2007 New Revision: 18762 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18762&repname= =3Djahia Log: JAHIA-2451: Hardcoded call in edition engine to a file defined in templates =
http://www.jahia.net/jira/browse/JAHIA-2451 JAHIA-2373: fck editor error http://www.jahia.net/jira/browse/JAHIA-2373 Resolution: check, if the configured files (CSS and Styles XML) are really = available in the current template set. If not, fallback to the default FCKe= ditor styles Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/fcke= ditor/fckeditor_htmleditor.jsp Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditor= s/fckeditor/fckeditor_htmleditor.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/htmleditors/fckeditor/fckeditor_htmledito= r.jsp&rev=3D18762&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/fcke= ditor/fckeditor_htmleditor.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/htmleditors/fcke= ditor/fckeditor_htmleditor.jsp Fri Oct 5 15:19:39 2007 @@ -81,8 +81,14 @@ jahiaPath.append(request.getServletPath()); } = - final String htmlEditorCSSUrl =3D (String)engineMap.get("htmlEditorCSS= Url"); - final String htmlEditorCSSDef =3D (String)engineMap.get("htmlEditorCSS= Def"); + String htmlEditorCSSUrl =3D (String)engineMap.get("htmlEditorCSSUrl"); + if (htmlEditorCSSUrl.length() !=3D 0 && pageContext.getServletContext(= ).getResource(htmlEditorCSSUrl) =3D=3D null) { + htmlEditorCSSUrl =3D ""; + } + String htmlEditorCSSDef =3D (String)engineMap.get("htmlEditorCSSDef"); + if (htmlEditorCSSDef.length() !=3D 0 && pageContext.getServletContext(= ).getResource(htmlEditorCSSDef) =3D=3D null) { + htmlEditorCSSDef =3D ""; + } = StringBuffer buff =3D new StringBuffer(); EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi= aEngine.ENGINE_LANGUAGE_HELPER); _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
