From dd49febd7707a3cc18354c8ca5486974a5b67760 Mon Sep 17 00:00:00 2001
From: Anders Bjerner <abjerner@skybrud.dk>
Date: Mon, 25 Jun 2018 23:51:19 +0200
Subject: [PATCH] U4-11477 Here we go again

https://github.com/umbraco/Umbraco-CMS/pull/2720#issuecomment-400106496
---
 .../mediaPicker/mediapicker.controller.js     | 39 ++++++++-----------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index a475ae9c52..e90afce7bb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -322,31 +322,24 @@ angular.module("umbraco")
                                 mediaItem.thumbnail = mediaHelper.resolveFileFromEntity(mediaItem, true);
                                 mediaItem.image = mediaHelper.resolveFileFromEntity(mediaItem, false);
                                 // set properties to match a media object
+                                mediaItem.properties = [];
                                 if (mediaItem.metaData) {
                                     if (mediaItem.metaData.umbracoWidth && mediaItem.metaData.umbracoHeight) {
-                                        mediaItem.properties = [
-                                            {
-                                                alias: "umbracoWidth",
-                                                value: mediaItem.metaData.umbracoWidth.Value
-                                            },
-                                            {
-                                                alias: "umbracoHeight",
-                                                value: mediaItem.metaData.umbracoHeight.Value
-                                            },
-                                            {
-                                                alias: "umbracoFile",
-                                                editor: mediaItem.metaData.umbracoFile.PropertyEditorAlias,
-                                                value: mediaItem.metaData.umbracoFile.Value
-                                            }
-                                        ];
-                                    } else {
-                                        mediaItem.properties = [
-                                            {
-                                                alias: "umbracoFile",
-                                                editor: mediaItem.metaData.umbracoFile.PropertyEditorAlias,
-                                                value: mediaItem.metaData.umbracoFile.Value
-                                            }
-                                        ];
+                                        mediaItem.properties.push({
+                                            alias: "umbracoWidth",
+                                            value: mediaItem.metaData.umbracoWidth.Value
+                                        });
+                                        mediaItem.properties.push({
+                                            alias: "umbracoHeight",
+                                            value: mediaItem.metaData.umbracoHeight.Value
+                                        });
+                                    }
+                                    if (mediaItem.metaData.umbracoFile) {
+                                        mediaItem.properties.push({
+                                            alias: "umbracoFile",
+                                            editor: mediaItem.metaData.umbracoFile.PropertyEditorAlias,
+                                            value: mediaItem.metaData.umbracoFile.Value
+                                        });
                                     }
                                 }
                             });