Merge pull request #602 from onkelandy/http

modules.http: fix window.pagelength if no datatable is present
smarthomeNG · Nov 1, 2023 · 847ea6c · 847ea6c
2 parents d2d5be7 + a3a34d8
commit 847ea6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/modules/http/webif/gstatic/js/smarthomeng_pageupdate.js b/modules/http/webif/gstatic/js/smarthomeng_pageupdate.js
@@ -46,9 +46,9 @@ $(window).on('load', function (e) {
   //setCookie('update_active', '', 0, window.pluginname);
   let cookie_interval = getCookie("update_interval");
   let cookie_active = getCookie("update_active");
-  if (cookie_active !== "")
+  if (cookie_active !== "" && typeof cookie_active == 'boolean')
     window.update_active = cookie_active;
-  if (cookie_interval !== "")
+  if (cookie_interval !== "" && typeof cookie_interval == 'number')
   {
     if (window.update_active == true)
       refresh.set_interval(cookie_interval, false);

diff --git a/modules/http/webif/gtemplates/base_plugin.html b/modules/http/webif/gtemplates/base_plugin.html
@@ -58,7 +58,7 @@
 		window.toggle = 1;
 		window.pluginname = '{{ p.get_fullname() }}';
 		window.pageLength = getCookie("pagelength");
-	  if (window.pageLength == "")
+	  if (window.pageLength == "" || Object.keys(window.pageLength).length === 0)
 	  {
 			window.pageLength = {}
 			let tabcount = 0;
@@ -77,7 +77,6 @@
 			    	pagelength = {{ webif_pagelength }};
 				{%- endif %}
 			  window.pageLength["bodytab_"+i] = {'tableid': 'unknown', 'pagelength': parseInt(pagelength)};
-				console.log(window.pageLength);
 			}
 			setCookie("pagelength", window.pageLength, 3650, window.pluginname);
 		}