FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 00:26:03 +00:00
Code Issues Releases Wiki Activity

01_FHEMWEB.pm/fhemweb.js: move confirmJSError to body, "patch" FWEXT/CONTENTFUNC data with attributes, to enable confirmJSError in FLOORPLAN and other modules

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13263 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-01-28 19:22:27 +00:00
parent 1612f0e0f6
commit e255bcd813
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/FHEM/01_FHEMWEB.pm
View File

@ -852,6 +852,13 @@ FW_answerCall($)
#Returns undef as FW_RETTYPE if it already sent a HTTP header #Returns undef as FW_RETTYPE if it already sent a HTTP header
no strict "refs"; no strict "refs";
($FW_RETTYPE, $FW_RET) = &{$h->{FUNC}}($arg); ($FW_RETTYPE, $FW_RET) = &{$h->{FUNC}}($arg);
if(defined($FW_RETTYPE) && $FW_RETTYPE =~ m,text/html,) {
my $dataAttr =
"data-confirmDelete='" .AttrVal($FW_wname,"confirmDelete",1) ."' ".
"data-confirmJSError='".AttrVal($FW_wname,"confirmJSError",1)."' ".
"data-webName='$FW_wname '";
$FW_RET =~ s/<body/<body $dataAttr/;
}
use strict "refs"; use strict "refs";
return defined($FW_RETTYPE) ? 0 : -1; return defined($FW_RETTYPE) ? 0 : -1;
} }
@ -971,7 +978,12 @@ FW_answerCall($)
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).'"';
$FW_id = $FW_chash->{NR} if( !$FW_id ); $FW_id = $FW_chash->{NR} if( !$FW_id );
FW_pO "</head>\n<body name=\"$t\" fw_id=\"$FW_id\" $gen $lp $csrf>";
my $dataAttr =
"data-confirmDelete='" .AttrVal($FW_wname,"confirmDelete",1) ."' ".
"data-confirmJSError='".AttrVal($FW_wname,"confirmJSError",1)."' ".
"data-webName='$FW_wname '";
FW_pO "</head>\n<body name='$t' fw_id='$FW_id' $gen $lp $csrf $dataAttr>";
if($FW_activateInform) { if($FW_activateInform) {
$cmd = "style eventMonitor $FW_activateInform"; $cmd = "style eventMonitor $FW_activateInform";
@ -1037,10 +1049,7 @@ sub
FW_addContent(;$) FW_addContent(;$)
{ {
my $add = ($_[0] ? " $_[0]" : ""); my $add = ($_[0] ? " $_[0]" : "");
FW_pO "<div id='content' ". FW_pO "<div id='content' $add>";
"data-confirmDelete='" .AttrVal($FW_wname,"confirmDelete",1) ."' ".
"data-confirmJSError='".AttrVal($FW_wname,"confirmJSError",1)."' ".
"data-webName='$FW_wname'$add>";
} }
sub sub

10
fhem/www/pgm2/fhemweb.js
View File

@ -35,7 +35,7 @@ window.onbeforeunload = function(e)
window.onerror = function(errMsg, url, lineno) window.onerror = function(errMsg, url, lineno)
{ {
url = url.replace(/.*\//,''); url = url.replace(/.*\//,'');
if($("div#content").attr("data-confirmJSError") != 0) if($("body").attr("data-confirmJSError") != 0)
FW_okDialog(url+" line "+lineno+":<br>"+errMsg); FW_okDialog(url+" line "+lineno+":<br>"+errMsg);
} }
@ -252,12 +252,12 @@ FW_filterIcons()
function function
FW_confirmDelete() FW_confirmDelete()
{ {
var d = $("div#content"); var b = $("body");
var cd = $(d).attr("data-confirmDelete"); var cd = $(b).attr("data-confirmDelete");
if(!cd || cd == 0) if(!cd || cd == 0)
return; return;
var wn = $(d).attr("data-webName"); var wn = $(b).attr("data-webName");
$(d).find("a").each(function(){ $("div#content").find("a").each(function(){
var href = $(this).attr("href"); var href = $(this).attr("href");
if(!href) if(!href)
return; return;