2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 04:36:36 +00:00

<my>.js: add propset id and "use strict"; (Forum #48362)

git-svn-id: https://svn.fhem.de/fhem/trunk@13574 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-03-02 09:35:26 +00:00
parent 938b7fe863
commit 9b4b00fb5c
5 changed files with 20 additions and 11 deletions

View File

@ -1,3 +1,6 @@
"use strict";
// "$Id$";
var consConn;
var consFilter, oldFilter;

View File

@ -1,3 +1,6 @@
"use strict";
// "$Id$";
var fd_loadedHash={}, fd_loadedList=[], fd_all={}, fd_allCnt, fd_progress=0,
fd_lang, fd_offsets=[], fd_scrolled=0, fd_modLinks={}, csrfToken="X";

View File

@ -1,6 +1,6 @@
"use strict";
var version="$Id$";
var FW_version="$Id$";
var FW_serverGenerated;
var FW_serverFirstMsg = (new Date()).getTime()/1000;
@ -64,7 +64,7 @@ FW_jqueryReadyFn()
{
if(FW_docReady) // loading fhemweb.js twice is hard to debug
return;
log(version);
log(FW_version);
FW_docReady = true;
FW_serverGenerated = $("body").attr("generated");
FW_longpollType = $("body").attr("longpoll");

View File

@ -1,4 +1,5 @@
"use strict";
// "$Id$";
if(!svgNS) {
var svgNS = "http://www.w3.org/2000/svg";

View File

@ -1,3 +1,6 @@
"use strict";
// "$Id$";
var zw_visible;
var svgns = 'xmlns="http://www.w3.org/2000/svg"';
@ -132,7 +135,7 @@ zw_draw(fnRet, width, height)
ox = o.x; oy = o.y;
})
.bind('drag', function(e, ui) {
var p = ui.position; op = ui.originalPosition;
var p = ui.position, op = ui.originalPosition;
o.x = ox + (p.left-op.left);
o.y = oy + (p.top -op.top);
$(o.rect).attr("x", o.x); $(o.rect).attr("y", o.y);
@ -495,7 +498,7 @@ GM()
this.repelMax =0.9; // max amount of repelling force.
this.paddingFactor =2.00; // factor by which an item is enlarged while avoiding overlap
var nrItems;
var nrItems, items;
var maxX, maxY, minX, minY; // bounds of drawing area
var scaleX,scaleY;
var cogX, cogY;
@ -507,7 +510,7 @@ GM()
{
var meanW=0, meanH=0;
for (i=1;i<nrItems;i++) {
for(var i=1; i<nrItems; i++) {
meanW+=items[i].width;
meanH+=items[i].height;
}
@ -610,8 +613,8 @@ GM()
this.layoutItems=function()
{
for(i1=0; i1<nrItems; i1++) {
for(i2=i1+1; i2<nrItems; i2++) {
for(var i1=0; i1<nrItems; i1++) {
for(var i2=i1+1; i2<nrItems; i2++) {
this.adjustItemDistance(items[i1], items[i2]);
this.repelItems (items[i1], items[i2]);
}
@ -696,10 +699,9 @@ GM()
this.meanTargetCenterDistance = function()
{
var r=0;
for(i1=1; i1<nrItems; i1++) r+=this.aid[i1][0];
r/=(nrItems-1);
for(var i1=1; i1<nrItems; i1++)
r += this.aid[i1][0];
r /= (nrItems-1);
return r;
}