FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

01_FHEMWEB.pm: Allow - in JavaScripts (Forum #43080)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9707 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-10-28 12:49:42 +00:00
parent c9a347501e
commit 7afe90349d
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/01_FHEMWEB.pm
View File

@ -754,13 +754,18 @@ FW_answerCall($)
FW_pO sprintf($jsTemplate, "", "$FW_ME/pgm2/jquery.min.js");
FW_pO sprintf($jsTemplate, "", "$FW_ME/pgm2/jquery-ui.min.js");
my (%jsNeg, @jsList);
map { $_ =~ m/^-(.*)$/ ? $jsNeg{$1} = 1 : push(@jsList, $_); }
split(" ", AttrVal($FW_wname, "JavaScripts", ""));
map { FW_pO sprintf($jsTemplate, "", "$FW_ME/pgm2/$_") if(!$jsNeg{$_}); }
@FW_fhemwebjs;
#######################
# "Own" JavaScripts + their Attributes
map { FW_pO sprintf($jsTemplate, "", "$FW_ME/pgm2/$_") } @FW_fhemwebjs;
map {
my $n = $_; $n =~ s+.*/++; $n =~ s/.js$//; $n =~ s/fhem_//; $n .= "Param";
FW_pO sprintf($jsTemplate, AttrVal($FW_wname, $n, ""), "$FW_ME/$_");
} split(" ", AttrVal($FW_wname, "JavaScripts", ""));
} @jsList;
########################
# FW Extensions
@ -2149,7 +2154,7 @@ FW_Attr(@)
map { $a{$_} = 1 } split(" ", $modules{FHEMWEB}{AttrList});
map {
$_ =~ s+.*/++; $_ =~ s/.js$//; $_ =~ s/fhem_//; $_ .= "Param";
push @add, $_ if(!$a{$_});
push @add, $_ if(!$a{$_} && $_ !~ m/^-/);
} split(" ", $a[3]);
$modules{FHEMWEB}{AttrList} .= " ".join(" ",@add) if(@add);
}
@ -3112,6 +3117,8 @@ FW_widgetOverride($$)
attr WEB JavaScripts codemirror/fhem_codemirror.js<br>
attr WEB codemirrorParam { "theme":"blackboard", "lineNumbers":true }
</code></ul>
Note: if the filename starts with - then it will be excluded for the
automatically loaded list (e.g. -fhemweb_fbcalllist.js)
</li><br>
<a name="longpoll"></a>
@ -3824,11 +3831,13 @@ FW_widgetOverride($$)
Benutzer dem Skript Parameter weiterreichen kann. Bei diesem
Attributnamen werden Verzeichnisname und fhem_ Pr&auml;fix entfernt
und Param als Suffix hinzugef&uuml;gt. Beispiel:
<ul><code>
attr WEB JavaScripts codemirror/fhem_codemirror.js<br>
attr WEB codemirrorParam { "theme":"blackboard", "lineNumbers":true }
</code></ul>
Falls der Dateiname mit - anf&auml;ngt, dann wird diese sonst
aus www/pgm2 automatisch geladene Datei nicht geladen. (z.Bsp.:
-fhemweb_fbcalllist.js)
</li><br>
<a name="longpoll"></a>