From 96fabc66a215d9fb890b37d52e5187f6bdd40452 Mon Sep 17 00:00:00 2001
From: maurofmferrao <maurofmferrao@gmail.com>
Date: Tue, 10 Oct 2023 15:25:11 +0100
Subject: [PATCH] Media library image element remove new prop relates to
 xibosignageltd/xibo-private#294

---
 modules/templates/global-elements.xml | 3 ---
 ui/src/editor-core/widget.js          | 9 ---------
 ui/src/layout-editor/viewer.js        | 2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/modules/templates/global-elements.xml b/modules/templates/global-elements.xml
index 3ad7b7fc15..8ae071a2c6 100644
--- a/modules/templates/global-elements.xml
+++ b/modules/templates/global-elements.xml
@@ -465,9 +465,6 @@ $(target).find('.date').each(function(_idx, dateEl){
         <canRotate>true</canRotate>
         <startWidth>250</startWidth>
         <startHeight>250</startHeight>
-        <properties>
-            <property id="mediaId" type="text"></property>
-        </properties>
     </template>
     <template>
         <id>line</id>
diff --git a/ui/src/editor-core/widget.js b/ui/src/editor-core/widget.js
index 29ec3500e9..630eaef016 100644
--- a/ui/src/editor-core/widget.js
+++ b/ui/src/editor-core/widget.js
@@ -661,15 +661,6 @@ Widget.prototype.saveElements = function(
     // Save only id and value for element properties if they are not empty
     if (element.properties != undefined) {
       element.properties = Object.values(element.properties).map((property) => {
-        // If property is mediaId and it's null, use element mediaId
-        if (
-          property.id === 'mediaId' &&
-          element.mediaId !== undefined &&
-          property.value === null
-        ) {
-          property.value = element.mediaId;
-        }
-
         return {
           id: property.id,
           value: property.value,
diff --git a/ui/src/layout-editor/viewer.js b/ui/src/layout-editor/viewer.js
index 1371126022..b735d474a8 100644
--- a/ui/src/layout-editor/viewer.js
+++ b/ui/src/layout-editor/viewer.js
@@ -1746,7 +1746,7 @@ Viewer.prototype.renderElementContent = function(
             convertedProperties[extendOverrideKey] = meta[metaKey];
           } else if (extendWithDataKey === 'mediaId') {
             convertedProperties[extendOverrideKey] =
-              '[[mediaId=' + convertedProperties[extendWithDataKey] + ']]';
+              '[[mediaId=' + element.mediaId + ']]';
           } else {
             convertedProperties[extendOverrideKey] =
               (elData) && elData[extendWithDataKey];