FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 02:10:32 +00:00
Code Issues Releases Wiki Activity

FHEMWEB.pm: Change order of JS script loading to fix a problem caused by

Browse Source 
fronthemEditor.js. loading jQuery in nonconflict mode


git-svn-id: https://svn.fhem.de/fhem/trunk@7521 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-01-11 12:51:59 +00:00
parent a479e42519
commit 625b08f98c
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fhem/FHEM/01_FHEMWEB.pm
View File

@ -708,9 +708,18 @@ FW_answerCall($)
######################## ########################
# JavaScripts # JavaScripts
my $jsTemplate = '<script type="text/javascript" src="%s"></script>'; my $jsTemplate =
FW_pO sprintf($jsTemplate, "$FW_ME/pgm2/jquery.min.js"); '<script attr=\'%s\' type="text/javascript" src="%s"></script>';
FW_pO sprintf($jsTemplate, "$FW_ME/pgm2/jquery-ui.min.js"); FW_pO sprintf($jsTemplate, "", "$FW_ME/pgm2/jquery.min.js");
FW_pO sprintf($jsTemplate, "", "$FW_ME/pgm2/jquery-ui.min.js");
#######################
# "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", ""));
######################## ########################
# FW Extensions # FW Extensions
@ -720,19 +729,10 @@ FW_answerCall($)
next if($h !~ m/HASH/ || !$h->{SCRIPT} || $h->{SCRIPT} =~ m+pgm2/jquery+); next if($h !~ m/HASH/ || !$h->{SCRIPT} || $h->{SCRIPT} =~ m+pgm2/jquery+);
my $script = $h->{SCRIPT}; my $script = $h->{SCRIPT};
$script = ($script =~ m,^/,) ? "$FW_ME$script" : "$FW_ME/pgm2/$script"; $script = ($script =~ m,^/,) ? "$FW_ME$script" : "$FW_ME/pgm2/$script";
FW_pO sprintf($jsTemplate, $script); FW_pO sprintf($jsTemplate, "", $script);
} }
} }
#######################
# Other JavaScripts + their Attributes
map { FW_pO sprintf($jsTemplate, "$FW_ME/pgm2/$_") } @FW_fhemwebjs;
$jsTemplate = '<script attr=\'%s\' type="text/javascript" src="%s"></script>';
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", ""));
my $csrf= ($FW_CSRF ? "fwcsrf='$defs{$FW_wname}{CSRFTOKEN}'" : ""); my $csrf= ($FW_CSRF ? "fwcsrf='$defs{$FW_wname}{CSRFTOKEN}'" : "");
my $gen = 'generated="'.(time()-1).'"'; my $gen = 'generated="'.(time()-1).'"';
my $lp = 'longpoll="'.AttrVal($FW_wname,"longpoll",1).'"'; my $lp = 'longpoll="'.AttrVal($FW_wname,"longpoll",1).'"';