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

f18.js: fix safari/use strict problem (Forum #82351)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15914 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-01-17 16:05:58 +00:00
parent 93972aa423
commit e3483c310b
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fhem/www/pgm2/f18.js
View File

@ -122,8 +122,7 @@ f18_tables()
if(FW_urlParams.cmd == "style%20select") { if(FW_urlParams.cmd == "style%20select") {
var row=0; var row=0;
function var addRow = function(name, desc, val)
addRow(name, desc, val)
{ {
$("table.f18colors") $("table.f18colors")
.append("<tr class='ar_"+name+" "+(++row%2 ? "even":"odd")+"'>"+ .append("<tr class='ar_"+name+" "+(++row%2 ? "even":"odd")+"'>"+
@ -131,10 +130,9 @@ f18_tables()
"<div class='col1'>"+desc+"</div></td>"+ "<div class='col1'>"+desc+"</div></td>"+
(val ? "<td><div class='col2'>"+val+"</div></div></td>" : '')+ (val ? "<td><div class='col2'>"+val+"</div></div></td>" : '')+
"</tr>"); "</tr>");
} };
function var addHider = function(name, desc, fn, lVarName)
addHider(name, desc, fn, lVarName)
{ {
addRow(name, desc, "<input type='checkbox'>"); addRow(name, desc, "<input type='checkbox'>");
$("table.f18colors tr.ar_"+name+" input") $("table.f18colors tr.ar_"+name+" input")
@ -145,10 +143,9 @@ f18_tables()
f18_setAttr(name, c); f18_setAttr(name, c);
fn(c); fn(c);
}); });
} };
function var addColorChooser = function(name, desc)
addColorChooser(name, desc)
{ {
addRow(name, desc, "<div class='cp'></div>"); addRow(name, desc, "<div class='cp'></div>");
FW_replaceWidget("table.f18colors tr.ar_"+name+" div.col2 div.cp", name, FW_replaceWidget("table.f18colors tr.ar_"+name+" div.col2 div.cp", name,
@ -158,7 +155,7 @@ f18_tables()
f18_setAttr(); f18_setAttr();
f18_setCss(name); f18_setCss(name);
}); });
} };
$("div#content > table").append("<tr class='f18'></tr>"); $("div#content > table").append("<tr class='f18'></tr>");
@ -167,10 +164,7 @@ f18_tables()
$("div.f18colors").css("margin-top", "20px"); $("div.f18colors").css("margin-top", "20px");
$("tr.f18").append("<table class='block wide f18colors'></table>"); $("tr.f18").append("<table class='block wide f18colors'></table>");
loadScript("pgm2/fhemweb_colorpicker.js", addColors); var addColors = function()
function
addColors()
{ {
$("table.f18colors") $("table.f18colors")
.append("<tr class='reset' "+(++row%2 ? "even":"odd")+"'>"+ .append("<tr class='reset' "+(++row%2 ? "even":"odd")+"'>"+
@ -244,7 +238,8 @@ f18_tables()
}, "f18_move"); }, "f18_move");
*/ */
} };
loadScript("pgm2/fhemweb_colorpicker.js", addColors);
} }
if(FW_urlParams.cmd == "style%20list" || if(FW_urlParams.cmd == "style%20list" ||