From 9e97b84fb83657bf01b07d92cf8f25600f997398 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Mon, 17 Mar 2014 17:39:05 +0100
Subject: [PATCH] Fixes issues with crop sizes prevalues

---
 .../views/prevalueeditors/cropsizes.controller.js   |  7 ++++++-
 .../src/views/prevalueeditors/cropsizes.html        | 13 ++++++-------
 .../PropertyEditors/ImageCropperPropertyEditor.cs   |  1 -
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/cropsizes.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/cropsizes.controller.js
index b79f1f6866..42391648ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/cropsizes.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/cropsizes.controller.js
@@ -17,6 +17,11 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.CropSizesControlle
 			$scope.newItem = item;
 		};
 
+		$scope.cancel = function(evt) {
+			evt.preventDefault();
+			$scope.newItem = null;
+		};
+
 		$scope.add = function (evt) {
 			evt.preventDefault();
 
@@ -29,7 +34,7 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.CropSizesControlle
 					return;
 				}
 			
-			$scope.newItem = undefined;
+			$scope.newItem = null;
 			//there was an error, do the highlight (will be set back by the directive)
 			$scope.hasError = true;
 			}
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/cropsizes.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/cropsizes.html
index 68949b42ec..3ef7e6f3bd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/cropsizes.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/cropsizes.html
@@ -1,10 +1,8 @@
 <div ng-controller="Umbraco.PrevalueEditors.CropSizesController" class="umb-editor umb-cropsizes">
-
 	<div class="control-group umb-contentpicker">
-		<ul class="unstyled list-icons" style="margin-top: 30px" 
+		<ul class="unstyled list-icons"
 			ui-sortable
-			ng-model="model.value">	
-			
+			ng-model="model.value">			
 			<li ng-repeat="node in model.value">	
 				<i class="icon icon-delete red hover-show pull-right" ng-click="remove(node, $event)"></i>
 				<i class="icon icon-picture handle hover-hide"></i> 
@@ -14,8 +12,8 @@
 			</li>
 		</ul>
 	</div>
-
-	<div class="form" ng-if="newItem">
+	
+	<div class="form" ng-show="newItem">
 		<h4>Define crop</h4>
 		<p>
 			Give the crop an alias and it's default width and height.
@@ -37,7 +35,8 @@
 		</div>    
 		
 		<div class="control-group">  
-		   	<button class="btn btn-success" ng-click="add($event)">Save</button> 
+		   	<button class="btn btn-small" ng-click="add($event)">Save crop</button>
+		   	<a href class="btn btn-small btn-link" ng-click="cancel($event)">Cancel</a>
 		</div>	
 	</div>
 
diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
index ca7c9a2ec3..4cacf18618 100644
--- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
@@ -42,7 +42,6 @@ namespace Umbraco.Web.PropertyEditors
         {
             _internalPreValues = new Dictionary<string, object>
                 {
-                    {"crops", "[]"},
                     {"focalPoint", "{left: 0.5, top: 0.5}"},
                     {"src", ""}
                 };