From ddfcc1ebd544cf958709004a82dc2eef6213d699 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Thu, 17 Apr 2014 20:24:28 +0000
Subject: [PATCH] fhemweb.js: call the callback even if the script is already
 loaded

git-svn-id: https://svn.fhem.de/fhem/trunk@5546 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/www/pgm2/fhemweb.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js
index 471ad41f9..9e1d6c1dc 100644
--- a/fhem/www/pgm2/fhemweb.js
+++ b/fhem/www/pgm2/fhemweb.js
@@ -291,7 +291,7 @@ FW_querySetSelected(el, val)
 //////////////////////////
 // start of script functions
 function
-loadScript(sname, cb)
+loadScript(sname, callback)
 {
   var h = document.head || document.getElementsByTagName('head')[0];
   var r = h.getAttribute("root");
@@ -300,19 +300,22 @@ loadScript(sname, cb)
   sname = r+"/"+sname;
   var arr = h.getElementsByTagName("script");
   for(var i1=0; i1<arr.length; i1++)
-    if(sname == arr[i1].getAttribute("src"))
+    if(sname == arr[i1].getAttribute("src")) {
+      if(callback)
+        callback();
       return;
+    }
   var script = document.createElement("script");
   script.src = sname;
   script.async = script.defer = false;
   script.type = "text/javascript";
-  script.onload = cb;
+  script.onload = callback;
   log("Loading "+sname);
   script.onreadystatechange = function() {
     if(script.readyState == 'loaded' || script.readyState == 'complete') {
       script.onreadystatechange = null;
-      if(cb)
-        cb();
+      if(callback)
+        callback();
     }
   }
   h.appendChild(script);