From 8bbeeb2eafd200ea6c1810aa9eb176f3ccdf94c5 Mon Sep 17 00:00:00 2001
From: Niels Hartvig <nh@umbraco.com>
Date: Wed, 10 Feb 2016 15:38:49 +0100
Subject: [PATCH] Fixes issue 7933

---
 .../views/propertyeditors/grid/editors/media.controller.js   | 5 +++++
 .../src/views/propertyeditors/grid/editors/media.html        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index a4d7be9486..fc642ff35e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -49,6 +49,11 @@ angular.module("umbraco")
                     }
                 }
 
+                // set default size if no crop present (moved from the view)
+                if (url.indexOf('?') == -1)
+                {
+                    url += "?width=800&upscale=false"
+                }
                 $scope.url = url;
             }
         };
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
index a54fdda966..dd35757397 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
@@ -9,7 +9,7 @@
 		<img
 			ng-if="url"
 			ng-click="setImage()"
-			ng-src="{{url}}?width=800&upscale=false"
+			ng-src="{{url}}"
 			class="fullSizeImage" />
         <input type="text" class="caption" ng-model="control.value.caption" localize="placeholder" placeholder="@grid_placeholderImageCaption" />
  	</div>