Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[mfinanz.git] / SL / Template / Plugin / JavaScript.pm

diff --git a/SL/Template/Plugin/JavaScript.pm b/SL/Template/Plugin/JavaScript.pm
index 2e05bed57e981e3afffc48c7773595c1ece1b727..16989e9a2d84f9e3396d72c1f86862c5663be2b5 100644 (file)
--- a/SL/Template/Plugin/JavaScript.pm
+++ b/SL/Template/Plugin/JavaScript.pm
@@ -17,14 +17,23 @@ sub new {
 # public interface
 #
 
 # public interface
 #
 

+# see ecmascript spec section 7.8.4
+my @escape_chars = ('\\', '\'', '"');
+my %control_chars = (
+  "\n"   => 'n',
+  "\t"   => 't',
+  "\r"   => 'r',
+  "\f"   => 'f',
+  "\x08" => 'b',
+  "\x0B" => 'v', # noone uses vertical tab anyway...
+);
+my $re = join '', map { qr/($_)/s } join '|', keys(%control_chars), map { "\Q$_\E" } @escape_chars;
+

 sub escape {
   my $self = shift;
   my $text = shift;
 
 sub escape {
   my $self = shift;
   my $text = shift;
 

-  $text =~ s|\\|\\\\|g;
-  $text =~ s|\"|\\\"|g;
-  $text =~ s|\n|\\n|g;
-  $text =~ s|\r|\\r|g;
+  $text =~ s/$re/'\\' . ($control_chars{$1} || $1)/egs;

 
   return $text;
 }
 
   return $text;
 }