Skip to content

Commit 5923347

Browse files
committed
PlgScheme: fix undefined images
1 parent b22360f commit 5923347

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

ScadaWeb/OpenPlugins/PlgScheme/plugins/Scheme/js/schemerender.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ scada.scheme.SchemeRenderer.prototype.createDom = function (elem, renderContext)
125125
this.setForeColor(divScheme, props.ForeColor);
126126

127127
// set background image if presents
128-
var backImage = renderContext.imageMap.get(elem.props.BackImage.Name);
128+
var backImage = renderContext.getImage(elem.props.BackImage);
129129
if (backImage) {
130130
divScheme.css({
131131
"background-image": this.imageToDataUrlCss(backImage),
@@ -451,7 +451,7 @@ scada.scheme.StaticPictureRenderer.prototype.createDom = function (elem, renderC
451451
}
452452

453453
divElem.css("background-repeat", "no-repeat");
454-
var image = renderContext.imageMap.get(props.Image.Name);
454+
var image = renderContext.getImage(props.Image);
455455
this.setBackgroundImage(divElem, image);
456456

457457
elem.dom = divElem;
@@ -485,15 +485,15 @@ scada.scheme.DynamicPictureRenderer.prototype.createDom = function (elem, render
485485
thisRenderer.setDynamicBorderColor(divElem, props.BorderColorOnHover, cnlNum, renderContext);
486486

487487
if (cnlNum <= 0) {
488-
var image = renderContext.imageMap.get(props.ImageOnHover.Name);
488+
var image = renderContext.getImage(props.ImageOnHover);
489489
thisRenderer.setBackgroundImage(divElem, image);
490490
}
491491
},
492492
function () {
493493
thisRenderer.setDynamicBorderColor(divElem, props.BorderColor, cnlNum, renderContext, true);
494494

495495
if (cnlNum <= 0) {
496-
var image = renderContext.imageMap.get(props.Image.Name);
496+
var image = renderContext.getImage(props.Image);
497497
thisRenderer.setBackgroundImage(divElem, image, true);
498498
}
499499
}
@@ -541,6 +541,11 @@ scada.scheme.RenderContext = function () {
541541
this.imageMap = null;
542542
};
543543

544+
// Get scheme image object by image property of an element
545+
scada.scheme.RenderContext.prototype.getImage = function (imageProp) {
546+
return imageProp ? this.imageMap.get(imageProp.Name) : null;
547+
};
548+
544549
/********** Renderer Map **********/
545550

546551
// Renderer map object

0 commit comments

Comments
 (0)