myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svieu...@apache.org
Subject cvs commit: incubator-myfaces/src/components/org/apache/myfaces/custom/htmlEditor HtmlEditorRenderer.java
Date Mon, 07 Feb 2005 01:40:42 GMT
svieujot    2005/02/06 17:40:42

  Modified:    src/components/org/apache/myfaces/custom/htmlEditor
                        HtmlEditorRenderer.java
  Log:
  style attribute fix.
  
  Revision  Changes    Path
  1.21      +7 -6      incubator-myfaces/src/components/org/apache/myfaces/custom/htmlEditor/HtmlEditorRenderer.java
  
  Index: HtmlEditorRenderer.java
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/htmlEditor/HtmlEditorRenderer.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- HtmlEditorRenderer.java	6 Feb 2005 19:45:32 -0000	1.20
  +++ HtmlEditorRenderer.java	7 Feb 2005 01:40:42 -0000	1.21
  @@ -35,6 +35,9 @@
    * @author Sylvain Vieujot (latest modification by $Author$)
    * @version $Revision$ $Date$
    * $Log$
  + * Revision 1.21  2005/02/07 01:40:42  svieujot
  + * style attribute fix.
  + *
    * Revision 1.20  2005/02/06 19:45:32  svieujot
    * Add allowExternalLinks attribute.
    *
  @@ -958,14 +961,12 @@
               if( !editor.isShowAnyToolBox() ){
                   writer.writeAttribute(HTML.STYLE_ATTR, "margin-right: 0.3em", null);
               }
  -            String tempInlineStyleClass = "";
               if( editor.getStyle()!=null ){
  -                // Convert the style into a style class so that the Zoom works as it's
relying on changing the class
  -                tempInlineStyleClass =  "kupu_tmpInlineClass"+editor.getId();
  -                AddResource.addInlineStyleToHeader(tempInlineStyleClass+"{"+editor.getStyle()+"}",context);
  +                // Convert the style into an style declaration so that it doesn't preempt
the Zoom works as it's relying on changing the class
  +                AddResource.addInlineStyleToHeader("#kupu-editor{"+editor.getStyle()+"}",context);
               }
               writer.writeAttribute(HTML.CLASS_ATTR,
  -                    "kupu-editorframe "+tempInlineStyleClass+(editor.getStyleClass()==null
? "" : " "+editor.getStyleClass()), null);
  +                    "kupu-editorframe"+(editor.getStyleClass()==null ? "" : " "+editor.getStyleClass()),
null);
               	writer.startElement(HTML.IFRAME_ELEM, null);
               	writer.writeAttribute(HTML.ID_ATTR, "kupu-editor", null);
               	writer.writeAttribute(HTML.FRAMEBORDER_ATTR, "0", null);
  
  
  

Mime
View raw message