From ae3205c4296e45d910ca451896318d4ac725593e Mon Sep 17 00:00:00 2001
From: Anders Bjerner <abjerner@skybrud.dk>
Date: Fri, 22 Jun 2018 19:09:20 +0200
Subject: [PATCH] Fixes U4-11426 for files as well

The original fix from #2679 only fixes the bug for images, as it checks whether the `umbracoWidth` and `umbracoHeight` properties are present. With this PR, the bug is now fixed for both images and regular files.
---
 .../mediaPicker/mediapicker.controller.js     | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 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 dc54eaf0a3..07c745c4c7 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
@@ -318,25 +318,32 @@ angular.module("umbraco")
                                 mediaItem.thumbnail = mediaHelper.resolveFileFromEntity(mediaItem, true);
                                 mediaItem.image = mediaHelper.resolveFileFromEntity(mediaItem, false);
                                 // set properties to match a media object
-                                if (mediaItem.metaData &&
-                                    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
-                                        }
-                                    ];
+                                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
+                                            }
+                                        ];
+                                    }
                                 }
                             });
                         // update images