dont reload jguage images multiple times

emoncms · Apr 9, 2020 · c9b8652 · c9b8652
1 parent 29ff998
commit c9b8652
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/widget/jgauge/jgauge_render.js b/widget/jgauge/jgauge_render.js
@@ -31,12 +31,16 @@ function jgauge_init()
   setup_widget_canvas('jgauge');
 
   // Load the needle image
-  needle = new Image();
-  needle.src = path+'Modules/dashboard/widget/jgauge/needle2.png';
+  if (needle==null) {
+    needle = new Image();
+    needle.src = path+'Modules/dashboard/widget/jgauge/needle2.png';
+  }
 
   // Load the jgauge image
-  img = new Image();
-  img.src = path+'Modules/dashboard/widget/jgauge/jgauge.png';
+  if (img==null) {
+    img = new Image();
+    img.src = path+'Modules/dashboard/widget/jgauge/jgauge.png';
+  }
 }
 
 function jgauge_draw()

diff --git a/widget/jgauge2/jgauge2_render.js b/widget/jgauge2/jgauge2_render.js
@@ -6,9 +6,9 @@
  */
 
 // Global variables
-var img = null,
-  needle = null,
-  needle2 = null;
+var img_jgauge2 = null,
+  needle_jgauge2 = null,
+  needle2_jgauge2 = null;
 
 function jgauge2_widgetlist()
 {
@@ -32,15 +32,21 @@ function jgauge2_init()
   setup_widget_canvas('jgauge2');
 
   // Load the needle image
-  needle_jgauge2 = new Image();
-  needle_jgauge2.src = path+'Modules/dashboard/widget/jgauge2/needle2.png';
+  if (needle_jgauge2==null) {
+    needle_jgauge2 = new Image();
+    needle_jgauge2.src = path+'Modules/dashboard/widget/jgauge2/needle2.png';
+  }
 
-  needle2_jgauge2 = new Image();
-  needle2_jgauge2.src = path+'Modules/dashboard/widget/jgauge2/needle.png';
+  if (needle2_jgauge2==null) {
+    needle2_jgauge2 = new Image();
+    needle2_jgauge2.src = path+'Modules/dashboard/widget/jgauge2/needle.png';
+  }
 
   // Load the jgauge2 image
-  img_jgauge2 = new Image();
-  img_jgauge2.src = path+'Modules/dashboard/widget/jgauge2/jgauge2.png';
+  if (img_jgauge2==null) {
+    img_jgauge2 = new Image();
+    img_jgauge2.src = path+'Modules/dashboard/widget/jgauge2/jgauge2.png';
+  }
 }
 
 function jgauge2_draw()