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

f18.js: Css editor, less flicker for SVG, longpollSVG fix, etc (Forum #82351)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15896 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-01-14 21:35:42 +00:00
parent 35b3ecda2a
commit 0f4b8663b4
4 changed files with 168 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/01_FHEMWEB.pm
View File

@ -141,6 +141,7 @@ FHEMWEB_Initialize($)
CORS:0,1 CORS:0,1
HTTPS:1,0 HTTPS:1,0
CssFiles CssFiles
Css:textField-long
JavaScripts JavaScripts
SVGcache:1,0 SVGcache:1,0
addHtmlTitle:1,0 addHtmlTitle:1,0
@ -951,6 +952,8 @@ FW_answerCall($)
FW_pO sprintf($cssTemplate, "pgm2/jquery-ui.min.css"); FW_pO sprintf($cssTemplate, "pgm2/jquery-ui.min.css");
map { FW_pO sprintf($cssTemplate, $_); } map { FW_pO sprintf($cssTemplate, $_); }
split(" ", AttrVal($FW_wname, "CssFiles", "")); split(" ", AttrVal($FW_wname, "CssFiles", ""));
my $css = AttrVal($FW_wname, "Css", "");
FW_pO "<style id='fhemweb_css'>$css</style>\n" if($css);
######################## ########################
# JavaScripts # JavaScripts
@ -3399,6 +3402,11 @@ FW_widgetOverride($$)
</code></ul> </code></ul>
</li><br> </li><br>
<a name="Css"></a>
<li>Css<br>
CSS included in the header after the CssFiles section.
</li><br>
<a name="cmdIcon"></a> <a name="cmdIcon"></a>
<li>cmdIcon<br> <li>cmdIcon<br>
Space separated list of cmd:iconName pairs. If set, the webCmd text is Space separated list of cmd:iconName pairs. If set, the webCmd text is
@ -4099,6 +4107,11 @@ FW_widgetOverride($$)
</code></ul> </code></ul>
</li><br> </li><br>
<a name="Css"></a>
<li>Css<br>
CSS, was nach dem CssFiles Abschnitt im Header eingefuegt wird.
</li><br>
<a name="defaultRoom"></a> <a name="defaultRoom"></a>
<li>defaultRoom<br> <li>defaultRoom<br>
Zeigt den angegebenen Raum an falls kein Raum explizit ausgew&auml;hlt Zeigt den angegebenen Raum an falls kein Raum explizit ausgew&auml;hlt

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

@ -1,14 +1,9 @@
/* "use strict";
- style FW_okDialog FW_version["f18.js"] = "$Id$";
- SVG width on mobile
- FLOORPLAN
- Dashboard
*/
var f18_attr, f18_aCol, f18_pinOut, f18_sd, f18_isMobile; // TODO: rewrite menu, dashboard, floorplan, fix longpollSVG
var f18_attr, f18_aCol, f18_sd, f18_isMobile, f18_icon={}, f18_move=false;
var f18_small = (screen.width < 480 || screen.height < 480); var f18_small = (screen.width < 480 || screen.height < 480);
// font-awesome: map-pin
var f18_pinIn='data:image/svg+xml;utf8,<svg viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path fill="gray" d="M896 1088q66 0 128-15v655q0 26-19 45t-45 19h-128q-26 0-45-19t-19-45v-655q62 15 128 15zm0-1088q212 0 362 150t150 362-150 362-362 150-362-150-150-362 150-362 362-150zm0 224q14 0 23-9t9-23-9-23-23-9q-146 0-249 103t-103 249q0 14 9 23t23 9 23-9 9-23q0-119 84.5-203.5t203.5-84.5z"/></svg>';
$(window).resize(f18_resize); $(window).resize(f18_resize);
$(document).ready(function(){ $(document).ready(function(){
@ -20,12 +15,12 @@ $(document).ready(function(){
f18_attr = f18_sd.f18; f18_attr = f18_sd.f18;
} }
if(!f18_attr) { if(!f18_attr) {
f18_attr = { "Pinned.menu":"true" }; f18_attr = { "Pinned.menu":"true", "savePinChanges":true };
f18_resetCol(); f18_resetCol();
f18_sd.f18 = f18_attr; f18_sd.f18 = f18_attr;
} }
f18_setCss(); f18_setCss('init');
var icon = FW_root+"/images/default/fhemicon_ios.png"; var icon = FW_root+"/images/default/fhemicon_ios.png";
$('head').append( $('head').append(
@ -41,8 +36,10 @@ $(document).ready(function(){
f18_aCol = getComputedStyle($("a").get(0),null).getPropertyValue('color'); f18_aCol = getComputedStyle($("a").get(0),null).getPropertyValue('color');
f18_pinIn = f18_pinIn.replace('gray', f18_aCol); for(var i in f18_icon)
f18_pinOut = f18_pinIn.replace('/>',' transform="rotate(90,896,896)"/>'); f18_icon[i] = f18_icon[i].replace('gray', f18_aCol);
f18_icon.pinOut = f18_icon.pinIn
.replace('/>',' transform="rotate(90,896,896)"/>');
if(f18_attr.hideLogo) { if(f18_attr.hideLogo) {
$("div#menuScrollArea div#logo").css("display", "none"); $("div#menuScrollArea div#logo").css("display", "none");
@ -51,16 +48,15 @@ $(document).ready(function(){
f18_menu(); f18_menu();
f18_tables(); f18_tables();
f18_svgSetCols(); f18_svgSetCols();
if(typeof svgCallback != "undefined")
svgCallback.f18 = f18_svgSetCols;
}); });
function function
f18_menu() f18_menu()
{ {
// font-awesome: bars
var bars='data:image/svg+xml;utf8,<svg viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path fill="gray" d="M1664 1344v128q0 26-19 45t-45 19h-1408q-26 0-45-19t-19-45v-128q0-26 19-45t45-19h1408q26 0 45 19t19 45zm0-512v128q0 26-19 45t-45 19h-1408q-26 0-45-19t-19-45v-128q0-26 19-45t45-19h1408q26 0 45 19t19 45zm0-512v128q0 26-19 45t-45 19h-1408q-26 0-45-19t-19-45v-128q0-26 19-45t45-19h1408q26 0 45 19t19 45z"/></svg>'
.replace('gray', f18_aCol);
$("<div id='menuBtn'></div>").prependTo("div#menuScrollArea") $("<div id='menuBtn'></div>").prependTo("div#menuScrollArea")
.css( {"background-image":"url('"+bars+"')", "cursor":"pointer" }) .css( {"background-image":"url('"+f18_icon.bars+"')", "cursor":"pointer" })
.click(function(){ $("div#menu").toggleClass("visible") }); .click(function(){ $("div#menu").toggleClass("visible") });
$("div#menu").prepend("<div></div>"); $("div#menu").prepend("<div></div>");
@ -102,6 +98,7 @@ f18_tables()
var ntr = $(el).closest("tr").next("tr"); var ntr = $(el).closest("tr").next("tr");
isFixed ? $(ntr).show() : $(ntr).hide(); isFixed ? $(ntr).show() : $(ntr).hide();
}); });
f18_addMove(el, function(){ log("Hello") });
}); });
if(FW_urlParams.detail) { if(FW_urlParams.detail) {
@ -123,8 +120,8 @@ f18_tables()
function function
addRow(name, desc, val) addRow(name, desc, val)
{ {
$("table.colors") $("table.f18colors")
.append("<tr class='"+name+" "+(++row%2 ? "even":"odd")+"'>"+ .append("<tr class='ar_"+name+" "+(++row%2 ? "even":"odd")+"'>"+
"<td "+(val ? "" : "colspan='2'")+">"+ "<td "+(val ? "" : "colspan='2'")+">"+
"<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>" : '')+
@ -132,13 +129,14 @@ f18_tables()
} }
function function
addHider(name, desc, fn) addHider(name, desc, fn, lVarName)
{ {
addRow(name, desc, "<input type='checkbox'>"); addRow(name, desc, "<input type='checkbox'>");
$("table.colors tr."+name+" input") $("table.f18colors tr.ar_"+name+" input")
.prop("checked", f18_attr[name]) .prop("checked", lVarName ? window[lVarName] : f18_attr[name])
.click(function(){ .click(function(){
var c = $(this).is(":checked"); var c = $(this).is(":checked");
if(!lVarName)
f18_setAttr(name, c); f18_setAttr(name, c);
fn(c); fn(c);
}); });
@ -148,12 +146,12 @@ f18_tables()
addColorChooser(name, desc) addColorChooser(name, desc)
{ {
addRow(name, desc, "<div class='cp'></div>"); addRow(name, desc, "<div class='cp'></div>");
FW_replaceWidget("table.colors tr."+name+" div.col2 div.cp", name, FW_replaceWidget("table.f18colors tr.ar_"+name+" div.col2 div.cp", name,
["colorpicker","RGB"], f18_attr.cols[name], name, "rgb", undefined, ["colorpicker","RGB"], f18_attr.cols[name], name, "rgb", undefined,
function(value) { function(value) {
f18_attr.cols[name] = value; f18_attr.cols[name] = value;
f18_setAttr(); f18_setAttr();
f18_setCss(); f18_setCss(name);
}); });
} }
@ -162,14 +160,14 @@ f18_tables()
$("tr.f18").append("<div class='fileList f18colors'>f18 special</div>"); $("tr.f18").append("<div class='fileList f18colors'>f18 special</div>");
$("div.f18colors").css("margin-top", "20px"); $("div.f18colors").css("margin-top", "20px");
$("tr.f18").append("<table class='block wide colors'></table>"); $("tr.f18").append("<table class='block wide f18colors'></table>");
loadScript("pgm2/fhemweb_colorpicker.js", addColors); loadScript("pgm2/fhemweb_colorpicker.js", addColors);
function function
addColors() addColors()
{ {
$("table.colors") $("table.f18colors")
.append("<tr class='reset' "+(++row%2 ? "even":"odd")+"'>"+ .append("<tr class='reset' "+(++row%2 ? "even":"odd")+"'>"+
"<td colspan='2'><div class='col1'>Preset colors: "+ "<td colspan='2'><div class='col1'>Preset colors: "+
"<a href='#'>default</a> "+ "<a href='#'>default</a> "+
@ -177,11 +175,11 @@ f18_tables()
"<a href='#'>dark</a> "+ "<a href='#'>dark</a> "+
"</div></td>"+ "</div></td>"+
"</tr>"); "</tr>");
$("table.colors tr.reset a").click(function(){ $("table.f18colors tr.reset a").click(function(){
row = 0; row = 0;
$("table.colors").html(""); $("table.f18colors").html("");
f18_resetCol($(this).text()); f18_resetCol($(this).text());
f18_setCss(); f18_setCss('preset');
f18_setAttr(); f18_setAttr();
addColors(); addColors();
}); });
@ -192,9 +190,38 @@ f18_tables()
addColorChooser("oddrow", "Odd row"); addColorChooser("oddrow", "Odd row");
addColorChooser("header", "Header row"); addColorChooser("header", "Header row");
addColorChooser("menu", "Menu"); addColorChooser("menu", "Menu");
addColorChooser("sel", "Menu/Selected"); addColorChooser("sel", "Menu:Selected");
addColorChooser("inpBack", "Input bg"); addColorChooser("inpBack", "Input bg");
$("table.colors input").attr("size", 8); $("table.f18colors input").attr("size", 8);
addRow("editStyle", "<a href='#'>Additional CSS</a>");
$("table.f18colors tr.ar_editStyle a").click(function(){
$('body').append(
'<div id="editdlg" style="display:none">'+
'<textarea id="f18_cssEd" rows="25" cols="60" style="width:99%"/>'+
'</div>');
$("#f18_cssEd").val($("head #fhemweb_css").html());
$('#editdlg').dialog(
{ modal:true, closeOnEscape:true, width:$(window).width()*3/4,
height:$(window).height()*3/4, title:$(this).text(),
close:function(){ $('#editdlg').remove(); },
buttons:[
{ text: "Cancel",click:function(){$(this).dialog('close')}},
{ text: "OK", click:function(){
if(!$("head #fhemweb_css"))
$("head").append("<style id='fhemweb_css'>\n</style>");
var txt = $("#f18_cssEd").val();
$("head #fhemweb_css").html(txt);
var wn = $("body").attr("data-webName");
FW_cmd(FW_root+"?cmd=attr "+wn+" Css "+
encodeURIComponent(txt.replace(/;/g,";;"))+"&XHR=1");
$(this).dialog('close');
}}]
});
});
addRow("empty", "&nbsp;"); addRow("empty", "&nbsp;");
addHider("hidePin", "Hide pin", function(c){ addHider("hidePin", "Hide pin", function(c){
$("div.pinHeader div.pin").css("display", c ? "none":"block"); $("div.pinHeader div.pin").css("display", c ? "none":"block");
@ -203,6 +230,15 @@ f18_tables()
$("div#menuScrollArea div#logo").css("display", c ? "none":"block"); $("div#menuScrollArea div#logo").css("display", c ? "none":"block");
f18_resize(); f18_resize();
}); });
addHider("savePinChanges", "Save pin changes", function(){});
/*
addHider("hideMove", "Drag group", function(c){
$("div.pinHeader div.move").css("display", c ? "block":"none");
f18_move = c;
}, "f18_move");
*/
} }
} }
@ -215,6 +251,7 @@ f18_tables()
var ntr = $(el).next("table"); var ntr = $(el).next("table");
isFixed ? $(ntr).show() : $(ntr).hide(); isFixed ? $(ntr).show() : $(ntr).hide();
}); });
f18_addMove(el, function(){ log("Hello") });
}); });
} }
} }
@ -223,7 +260,7 @@ function
f18_resize() f18_resize()
{ {
var w=$(window).width(); var w=$(window).width();
log("W:"+w+" S:"+screen.width); log("f18.js W:"+w+" S:"+screen.width);
var diff = 0 var diff = 0
diff += f18_attr.hideLogo ? 0 : 40; diff += f18_attr.hideLogo ? 0 : 40;
@ -243,7 +280,8 @@ f18_addPin(el, name, defVal, fn, hidePin)
init = defVal; init = defVal;
$("<div class='pin'></div>") $("<div class='pin'></div>")
.appendTo(el) .appendTo(el)
.css("background-image", "url('"+(init ? f18_pinIn : f18_pinOut)+"')"); .css("background-image", "url('"+
(init ? f18_icon.pinIn : f18_icon.pinOut)+"')");
$(el).addClass("col_header pinHeader "+name.replace(/[^A-Z0-9]/ig,'_')); $(el).addClass("col_header pinHeader "+name.replace(/[^A-Z0-9]/ig,'_'));
el = $(el).find("div.pin"); el = $(el).find("div.pin");
$(el) $(el)
@ -253,19 +291,34 @@ f18_addPin(el, name, defVal, fn, hidePin)
.click(function(){ .click(function(){
var nextVal = !$(el).hasClass("pinIn"); var nextVal = !$(el).hasClass("pinIn");
$(el).toggleClass("pinIn"); $(el).toggleClass("pinIn");
$(el).css("background-image","url('"+(nextVal ?f18_pinIn:f18_pinOut)+"')") $(el).css("background-image","url('"+
(nextVal ? f18_icon.pinIn : f18_icon.pinOut)+"')")
f18_setAttr("Pinned."+name, nextVal); f18_setAttr("Pinned."+name, nextVal);
fn(nextVal); fn(nextVal);
}); });
fn(init); fn(init);
} }
function
f18_addMove(el, fn)
{
$("<div class='move'></div>")
.appendTo(el)
.css("background-image", "url('"+f18_icon.arrows+"')")
.css("display", f18_move ? "block":"none");
el = $(el).find("div.move");
$(el)
.css("cursor", "pointer")
.click(fn);
}
function function
f18_setAttr(name, value) f18_setAttr(name, value)
{ {
if(name) if(name)
f18_attr[name]=value; f18_attr[name]=value;
if(name && name.indexOf("Pinned.") == 0 && !f18_attr.savePinChanges)
return;
var wn = $("body").attr("data-webName"); var wn = $("body").attr("data-webName");
FW_cmd(FW_root+"?cmd=attr "+wn+" styleData "+ FW_cmd(FW_root+"?cmd=attr "+wn+" styleData "+
encodeURIComponent(JSON.stringify(f18_sd, null, 2))+"&XHR=1"); encodeURIComponent(JSON.stringify(f18_sd, null, 2))+"&XHR=1");
@ -288,16 +341,16 @@ f18_resetCol(name)
f18_attr.cols = name ? cols[name] : cols["default"]; f18_attr.cols = name ? cols[name] : cols["default"];
} }
// Put all the colors into a head style tag, send background changes to FHEM
function function
f18_setCss() f18_setCss(why)
{ {
var cols = f18_attr.cols; var cols = f18_attr.cols;
var style = ""; var style = "";
function bg(c) { return "{ background:#"+c+"; fill:#"+c+"; }\n" } function bg(c) { return "{ background:#"+c+"; fill:#"+c+"; }\n" }
function fg(c) { return "{ color:#"+c+"; }\n" } function fg(c) { return "{ color:#"+c+"; }\n" }
style += ".col_fg, body, input "+fg(cols.fg); style += ".col_fg, body, input, textarea "+fg(cols.fg);
style += ".col_bg, body, #menu, input, option "+bg(cols.bg); style += ".col_bg, body, #menu, textarea, input, option "+bg(cols.bg);
style += ".col_fg, body, input { color:#"+cols.fg+"; }\n";
style += ".col_link, a, .handle, .fhemlog, input[type=submit], select "+ style += ".col_link, a, .handle, .fhemlog, input[type=submit], select "+
"{color:#"+cols.link+"; stroke:#"+cols.link+";}\n"; "{color:#"+cols.link+"; stroke:#"+cols.link+";}\n";
style += "svg:not([fill]):not(.jssvg) { fill:#"+cols.link+"; }\n"; style += "svg:not([fill]):not(.jssvg) { fill:#"+cols.link+"; }\n";
@ -316,26 +369,37 @@ f18_setCss()
style += "div.ui-dialog { border:1px solid #"+cols.link+"; }"; style += "div.ui-dialog { border:1px solid #"+cols.link+"; }";
style += "button.ui-button { background:#"+cols.oddrow+"!important; "+ style += "button.ui-button { background:#"+cols.oddrow+"!important; "+
"border:1px solid #"+cols.link+"!important; }\n"; "border:1px solid #"+cols.link+"!important; }\n";
$("head style#f18_css").remove();
$("head style.f18").remove(); if(why == 'preset' || why == 'bg') { // Add background to css to avoid flicker
$("head").append("<style class='f18'>"+style+"</style>"); if(!$("head #fhemweb_css").length)
$("head").append("<style id='fhemweb_css'>\n</style>");
var otxt = $("head #fhemweb_css").html(), ntxt = otxt;
if(!ntxt)
ntxt = "";
ntxt = ntxt.replace(/^body,#menu { background:[^;]*; }[\r\n]*/m,'');
ntxt += "body,#menu { background:#"+cols.bg+"; }\n";
if(ntxt != otxt) {
$("head #fhemweb_css").html(ntxt);
var wn = $("body").attr("data-webName");
FW_cmd(FW_root+"?cmd=attr "+wn+" Css "+
encodeURIComponent(ntxt.replace(/;/g,";;"))+"&XHR=1");
}
}
style = "<style id='f18_css'>"+style+"</style>";
if($("head style#fhemweb_css").length)
$("head style#fhemweb_css").before(style);
else
$("head").append(style);
} }
var dbg; // SVG color tuning
function function
f18_svgSetCols() f18_svgSetCols(svg)
{ {
$("body embed").each(function(){ if(!svg || !svg.getAttribute("data-origin"))
this.addEventListener('load', function(){
var svg = FW_getSVG(this);
if(svg.contentType != "image/svg+xml")
return; return;
if(!svg || !svg.firstChild || !svg.firstChild.nextSibling)
return;
svg = svg.firstChild.nextSibling;
if(!svg.getAttribute("data-origin"))
return;
var style = $(svg).find("> style").first(); var style = $(svg).find("> style").first();
var sTxt = $(style).text(); var sTxt = $(style).text();
@ -363,7 +427,12 @@ f18_svgSetCols()
var stA = $(svg).find("> defs > #gr_bg").children(); var stA = $(svg).find("> defs > #gr_bg").children();
$(stA[0]).css("stop-color", addCol(cols.bg, 10)); $(stA[0]).css("stop-color", addCol(cols.bg, 10));
$(stA[1]).css("stop-color", addCol(cols.bg, -10)); $(stA[1]).css("stop-color", addCol(cols.bg, -10));
}, false);
});
} }
// font-awesome
var f18_svgPrefix='data:image/svg+xml;utf8,<svg viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path fill="gray" ';
f18_icon.pinIn=f18_svgPrefix+'d="M896 1088q66 0 128-15v655q0 26-19 45t-45 19h-128q-26 0-45-19t-19-45v-655q62 15 128 15zm0-1088q212 0 362 150t150 362-150 362-362 150-362-150-150-362 150-362 362-150zm0 224q14 0 23-9t9-23-9-23-23-9q-146 0-249 103t-103 249q0 14 9 23t23 9 23-9 9-23q0-119 84.5-203.5t203.5-84.5z"/></svg>';
f18_icon.bars=f18_svgPrefix+'d="M1664 1344v128q0 26-19 45t-45 19h-1408q-26 0-45-19t-19-45v-128q0-26 19-45t45-19h1408q26 0 45 19t19 45zm0-512v128q0 26-19 45t-45 19h-1408q-26 0-45-19t-19-45v-128q0-26 19-45t45-19h1408q26 0 45 19t19 45zm0-512v128q0 26-19 45t-45 19h-1408q-26 0-45-19t-19-45v-128q0-26 19-45t45-19h1408q26 0 45 19t19 45z"/></svg>';
f18_icon.arrows=f18_svgPrefix+'d="M1792 896q0 26-19 45l-256 256q-19 19-45 19t-45-19-19-45v-128h-384v384h128q26 0 45 19t19 45-19 45l-256 256q-19 19-45 19t-45-19l-256-256q-19-19-19-45t19-45 45-19h128v-384h-384v128q0 26-19 45t-45 19-45-19l-256-256q-19-19-19-45t19-45l256-256q19-19 45-19t45 19 19 45v128h384v-384h-128q-26 0-45-19t-19-45 19-45l256-256q19-19 45-19t45 19l256 256q19 19 19 45t-19 45-45 19h-128v384h384v-128q0-26 19-45t45-19 45 19l256 256q19 19 19 45z"/></svg>';

3
fhem/www/pgm2/f18style.css
View File

@ -22,6 +22,7 @@ table.room,table.block.wide,table.fileList {
border-spacing:0; border-spacing:0;
border-top:1px solid gray; border-top:1px solid gray;
} }
table.block.wide td > div { padding:0 4px; }
#menuScrollArea { display:none; } /* commandref */ #menuScrollArea { display:none; } /* commandref */
body[fw_id] #menuScrollArea { display:block; } /* not commandref */ body[fw_id] #menuScrollArea { display:block; } /* not commandref */
@ -43,7 +44,7 @@ div.dist { padding-top:0.3em; }
button.dist { margin:10px; background:transparent; border:0px; cursor:pointer; } button.dist { margin:10px; background:transparent; border:0px; cursor:pointer; }
select,input[type=submit] { cursor:pointer; } select,input[type=submit] { cursor:pointer; }
div.pin { float:right; width:1em; height:1em; } div.pin, div.move { float:right; width:1em; height:1em; margin-left:0.5em; }
div.pinHeader { height:1em; padding:2px; } div.pinHeader { height:1em; padding:2px; }
body.touch a { font-size: 20px; } body.touch a { font-size: 20px; }

3
fhem/www/pgm2/svg.js
View File

@ -1,6 +1,7 @@
"use strict"; "use strict";
FW_version["svg.js"] = "$Id$"; FW_version["svg.js"] = "$Id$";
var svgCallback={};
if(!svgNS) { if(!svgNS) {
var svgNS = "http://www.w3.org/2000/svg"; var svgNS = "http://www.w3.org/2000/svg";
var svg_initialized={}, lastHidden; var svg_initialized={}, lastHidden;
@ -343,6 +344,8 @@ svg_init_one(embed, svg)
return; return;
svg_initialized[sid] = true; svg_initialized[sid] = true;
$("text.legend", svg).click(function(e){sv_menu(e, embed)}); $("text.legend", svg).click(function(e){sv_menu(e, embed)});
for(var i in svgCallback)
svgCallback[i](svg);
} }
function function