[TWiki-Dev] [SVN] r8272 - twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/lib/TWiki/Plugins/WysiwygPlugin

[<Cra...@nt...>]

Author: CrawfordCurrie
Date: 2006-01-13 09:18:54 -0800 (Fri, 13 Jan 2006)
New Revision: 8272

Modified:
   twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/lib/TWiki/Plugins/WysiwygPlugin/TML2HTML.pm
Log:
Item1391: added special interpretation of IMG tags to expand selected TWiki variables within SRC attributes

Modified: twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/lib/TWiki/Plugins/WysiwygPlugin/TML2HTML.pm
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/lib/TWiki/Plugins/WysiwygPlugin/TML2HTML.pm	2006-01-13 16:52:26 UTC (rev 8271)
+++ twiki/branches/DEVELOP/twikiplugins/WysiwygPlugin/lib/TWiki/Plugins/WysiwygPlugin/TML2HTML.pm	2006-01-13 17:18:54 UTC (rev 8272)
@@ -189,6 +189,12 @@
     return "$TT1$ref$TT1";
 }
 
+sub _expandURL {
+    my( $this, $url ) = @_;
+    return $url unless ( $this->{opts}->{expandVarsInURL} );
+    return &{$this->{opts}->{expandVarsInURL}}( $url, $this->{opts} );
+}
+
 sub _makeSquab {
     my( $this, $url, $text ) = @_;
 
@@ -250,6 +256,10 @@
 
     $text =~ s/<(.?(noautolink|nop).*?)>/$TT1($1)$TT1/gi;
 
+    # Expand selected TWiki variables in IMG tags so that images appear in the
+    # editor as images
+    $text =~ s/(<img [^>]*src=)(["'])(.*?)\2/$1.$2.$this->_expandURL($3).$2/gie;
+
     # protect HTML tags by pulling them out
     $text =~ s/(<\/?[a-z]+(\s[^>]*)?>)/ $this->_liftOut($1) /gei;
 
@@ -434,7 +444,6 @@
         }
     }
 
-
     _putBackBlocks( $text, $removed, 'noautolink', 'div' );
 
     _putBackBlocks( $text, $removed, 'pre' );