Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v diff -u -r1.60 -r1.61 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 28 Mar 2008 14:11:59 -0000 1.60 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 28 Mar 2008 21:55:02 -0000 1.61 @@ -580,7 +580,7 @@ # # TODO: this should be made a slot setting # - #my msg "args=$args,[llength $args]" + #my msg "setting editor for [my name], args=$args,[llength $args]" if {[llength $args] == 0} {return [my set editor]} set editor [lindex $args 0] if {[my exists editor] && $editor eq [my set editor] && [my exists __initialized]} return @@ -596,8 +596,8 @@ error [_ xowiki.error-form_constraint-unknown_editor \ [list name [my name] editor [my editor] editors $editors]] } + foreach m [my info mixin] {if {[$m exists editor_mixin]} {my mixin delete $m}} my mixin add $editor_class - set old_class [my info class] #my msg "MIXIN $editor: [my info precedence]" my reset_parameter my set __initialized 1 @@ -658,7 +658,7 @@ ::xo::Page requireCSS "/resources/xowiki/wymeditor/skins/default/screen.css" ::xo::Page requireJS "/resources/xowiki/jquery/jquery.js" ::xo::Page requireJS "/resources/xowiki/wymeditor/jquery.wymeditor.pack.js" - regsub -all {[.]} [my id] {\\\\.} JID + regsub -all {[.:]} [my id] {\\\\&} JID set config "" if {[my exists height] || [my exists width]} { set height_cmd "" @@ -712,11 +712,11 @@ if {![my exists style]} {my set style "width: 100%"} } FormField::richtext::xinha instproc render_input {} { - if {![my istype FormField::richtext]} { + if {![my istype ::xowiki::FormField::richtext]} { # TODO remove me: this would be an alternative to the mixin removal, # but we would have to do it in textarea as well, so the mixin # removal in hidden seems the better option ... - my msg NORICH=[my info precedence] + my msg NORICH=cl=[my info class],p?[my info precedence] next } else { # we use for the time being the initialization of xinha based on Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.138 -r1.139 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 28 Mar 2008 14:11:59 -0000 1.138 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 28 Mar 2008 21:55:02 -0000 1.139 @@ -665,7 +665,6 @@ foreach f $form_fields { if {[$f name] eq $name} {set found 1; break} } - my msg "form_field $name, found = $found" if {!$found} { set f [my create_raw_form_field -name $name -slot [my find_slot $name]] } @@ -1031,7 +1030,7 @@ foreach f $form_fields { if {[string match "__category_*" [$f name]]} { $f render_item - } elseif {[$f istype "::xowiki::FormField::richtext::wym"]} { + } elseif {[$f ismixin "::xowiki::FormField::richtext::wym"]} { set submit_button_class "wymupdate" } elseif {[$f istype "::xowiki::CompoundField"]} { foreach c [$f components] {