cvs commit: jahia/src/java/org/jahia/services/htmlparser JahiaTextContentTidy.java

[Khue Nguyen]

knguyen     2004/10/14 14:57:30 CEST

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/services/htmlparser 
                                           JahiaTextContentTidy.java 
  Log:
  - declare p tag as inline tag , avoinding tidy indentation which cause trouble in 
html editors.
  
  Revision  Changes    Path
  1.5.2.4   +0 -3      
jahia/src/java/org/jahia/services/htmlparser/JahiaTextContentTidy.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/htmlparser/JahiaTextContentTidy.java.diff?r1=1.5.2.3&r2=1.5.2.4&f=h
  
  
  
  Index: JahiaTextContentTidy.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/htmlparser/Attic/JahiaTextContentTidy.java,v
  retrieving revision 1.5.2.3
  retrieving revision 1.5.2.4
  diff -u -r1.5.2.3 -r1.5.2.4
  --- JahiaTextContentTidy.java 29 Sep 2004 14:23:33 -0000      1.5.2.3
  +++ JahiaTextContentTidy.java 14 Oct 2004 12:57:30 -0000      1.5.2.4
  @@ -50,7 +50,6 @@
       public static String JAHIA_HTML_OPEN_TAG = "<jahiahtml>";
       public static String JAHIA_RESOURCE_MARKER = "jahia$resource$marker";
       public static String JAHIA_EXPRESSION_MARKER = "jahia$expression$marker";
  -    public static String JAHIA_INLINE_NBSP_MARKER = "$jahia_inline_nbsp$";
       public static String JAHIA_HTML_CLOSE_TAG = "</jahiahtml>";
       public static String NEW_LINE = "$$$nl$$$";
       public static String WHITE_SPACE = "$$$ws$$$";
  @@ -73,7 +72,6 @@
           result = 
JahiaTools.replacePatternIgnoreCase(result,"</html>",JAHIA_HTML_CLOSE_TAG);
           result = 
JahiaTools.replacePatternIgnoreCase(result,"<jahia-resource",JAHIA_RESOURCE_MARKER);
           result = 
JahiaTools.replacePatternIgnoreCase(result,"<jahia-expression",JAHIA_EXPRESSION_MARKER);
  -        result = 
JahiaTools.replacePatternIgnoreCase(result,"<p>&nbsp;</p>",JAHIA_INLINE_NBSP_MARKER);
           result = JahiaTools.replacePattern(result,"\r\n","\n");
           result = encodeLineBreak(result,false);
           result = encodeTextAreaWhiteSpace(result,true);
  @@ -101,7 +99,6 @@
           result = 
JahiaTools.replacePatternIgnoreCase(result,JAHIA_HTML_CLOSE_TAG,"</html>");
           result = 
JahiaTools.replacePatternIgnoreCase(result,JAHIA_RESOURCE_MARKER,"<jahia-resource");
           result = 
JahiaTools.replacePatternIgnoreCase(result,JAHIA_EXPRESSION_MARKER,"<jahia-expression");
  -        result = 
JahiaTools.replacePatternIgnoreCase(result,JAHIA_INLINE_NBSP_MARKER,"<p>&nbsp;</p>");
           result = encodeTextAreaWhiteSpace(result,false);
           return result.trim();
       }