[interchange-cvs] interchange - racke modified code/Widget/htmlarea.widget

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2005-11-26 10:20:57 GMT
Modified:  code/Widget htmlarea.widget
Log:
merged changes 1.6 vs 1.6.2.1
+++ 1.6.2.1 +++
renamed "extra" option which is a standard widget parameter to
htmlarea_config, fixes Debian bug #340568

Revision  Changes    Path
1.7       +6 -6      interchange/code/Widget/htmlarea.widget


rev 1.7, prev_rev 1.6
Index: htmlarea.widget
===================================================================
RCS file: /var/cvs/interchange/code/Widget/htmlarea.widget,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- htmlarea.widget	11 Sep 2005 23:46:39 -0000	1.6
+++ htmlarea.widget	26 Nov 2005 10:20:57 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 2005 Interchange Development Group (http://www.icdevgroup.org/)
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: htmlarea.widget,v 1.6 2005/09/11 23:46:39 docelic Exp $
+# $Id: htmlarea.widget,v 1.7 2005/11/26 10:20:57 racke Exp $
 
 CodeDef htmlarea Widget 1
 CodeDef htmlarea Description Rich text editor
@@ -110,10 +110,10 @@
 	my $pre_scr = '';
 	my $post_scr = '';
 	my $onmouse = '';
-	my $extra = '';
+	my $htmlarea_config = '';
 	
-	if ($opt->{extra}) {
-		$extra = ", $opt->{extra}";
+	if ($opt->{htmlarea_config}) {
+		$htmlarea_config = ", $opt->{htmlarea_config}";
 	}
 
 	if($Session->{browser} =~ /MSIE/) {
@@ -122,12 +122,12 @@
 var htmlarea_needinit_$pname = true;
 </script>
 };
-		$onmouse = qq{ onMouseOver="if(htmlarea_needinit_$pname) { HTMLArea.replace('htmlarea_$pname'$extra); htmlarea_needinit_$pname=false }"};
+		$onmouse = qq{ onMouseOver="if(htmlarea_needinit_$pname) { HTMLArea.replace('htmlarea_$pname'$htmlarea_config); htmlarea_needinit_$pname=false }"};
 	}
 	else {
 		$post_scr = <<EOF;
 <script>
-	HTMLArea.replace('htmlarea_$pname'$extra);
+	HTMLArea.replace('htmlarea_$pname'$htmlarea_config);
 </script>
 EOF
 	}