U4-11477 Here we go again

https://github.com/umbraco/Umbraco-CMS/pull/2720#issuecomment-400106496
2018-06-25 23:58:25 +02:00
1 changed files with 16 additions and 23 deletions
@@ -318,31 +318,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
+                                        });
                                    }
                                }
                            });