diff --git a/fhem/CHANGED b/fhem/CHANGED index 31f954412..19dcd1ab0 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -529,3 +529,4 @@ - feature: CUL: device acces code reorganized, TCP/IP support added - feature: Pachube module from Axel - feature: dumpdef module from Axel in contrib + - feature: javascripting support in FHEMWEB (Klaus/Axel) diff --git a/fhem/webfrontend/pgm2/01_FHEMWEB.pm b/fhem/webfrontend/pgm2/01_FHEMWEB.pm index c5315ffbe..637a215fe 100755 --- a/fhem/webfrontend/pgm2/01_FHEMWEB.pm +++ b/fhem/webfrontend/pgm2/01_FHEMWEB.pm @@ -229,12 +229,14 @@ FW_AnswerCall($) close(FH); $__RETTYPE = "text/plain; charset=ISO-8859-1" if($f !~ m/\.*html$/); return 1; + } elsif($arg =~ m,^$__ME/(.*).css,) { open(FH, "$__dir/$1.css") || return; pO join("", ); close(FH); $__RETTYPE = "text/css"; return 1; + } elsif($arg =~ m,^$__ME/icons/(.*)$,) { open(FH, "$__dir/$1") || return; binmode (FH); # necessary for Windows @@ -243,9 +245,18 @@ FW_AnswerCall($) my @f_ext = split(/\./,$1); #kpb $__RETTYPE = "image/$f_ext[-1]"; return 1; + + } elsif($arg =~ m,^$__ME/(.*).js,) { #kpb java include + open(FH, "$__dir/$1.js") || return; + pO join("", ); + close(FH); + $__RETTYPE = "application/javascript"; + return 1; + } elsif($arg !~ m/^$__ME(.*)/) { Log(5, "Unknown document $arg requested"); return 0; + } ##############################