Item11833: don't use getDisplayValue()

... other than getting a mapped value.
foswiki · Sep 17, 2014 · 22c5df2 · 22c5df2
1 parent 92b858e
commit 22c5df2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/JQueryPlugin/lib/Foswiki/Form/Color.pm b/JQueryPlugin/lib/Foswiki/Form/Color.pm
@@ -49,20 +49,14 @@ sub renderForDisplay {
 
     Foswiki::Plugins::JQueryPlugin::createPlugin("farbtastic");
 
-    my $displayValue = $this->getDisplayValue($value);
+    my $displayValue =
+"<span class='jqFarbtasticFG' style='background-color:$value;width:$this->{size}em'>$value</span>";
     $format =~ s/\$value\(display\)/$displayValue/g;
     $format =~ s/\$value/$value/g;
 
     return $this->SUPER::renderForDisplay( $format, $value, $attrs );
 }
 
-sub getDisplayValue {
-    my ( $this, $value ) = @_;
-
-    return
-"<span class='jqFarbtasticFG' style='background-color:$value;width:$this->{size}em'>$value</span>";
-}
-
 1;
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/

diff --git a/JQueryPlugin/lib/Foswiki/Form/Rating.pm b/JQueryPlugin/lib/Foswiki/Form/Rating.pm
@@ -136,13 +136,13 @@ sub renderForEdit {
 sub renderForDisplay {
     my ( $this, $format, $value, $attrs ) = @_;
 
-    my $displayValue = $this->getDisplayValue($value);
-    $format =~ s/\$value\(display\)/$displayValue/g;
+    $format =~ s/\$value\(display\)/$this->renderDisplayValue($value)/ge;
     $format =~ s/\$value/$value/g;
+
     return $this->SUPER::renderForDisplay( $format, $value, $attrs );
 }
 
-sub getDisplayValue {
+sub renderDisplayValue {
     my ( $this, $value ) = @_;
 
     Foswiki::Plugins::JQueryPlugin::createPlugin("rating");