From fea038ccd4f1a12407e26e5c258774c179733def Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 25 Aug 2015 10:56:05 +0200
Subject: [PATCH] property settings: property validation null check + remove
 textarea when no validation type is chosen.

---
 .../editpropertysettings.controller.js                 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/editpropertysettings/editpropertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/editpropertysettings/editpropertysettings.controller.js
index 2bbbd28cb1..458fdbe813 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/editpropertysettings/editpropertysettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/editpropertysettings/editpropertysettings.controller.js
@@ -12,7 +12,7 @@ function EditPropertySettingsController($scope, contentTypeResource) {
     $scope.propertySettings.validationTypes = [];
     $scope.propertySettings.showValidationPattern = false;
 
-    //$scope.selectedValidationType = {};
+    $scope.selectedValidationType = {};
 
     $scope.validationTypes = [
         {
@@ -77,8 +77,12 @@ function EditPropertySettingsController($scope, contentTypeResource) {
     }
 
     $scope.changeValidationType = function(selectedValidationType) {
-        $scope.model.property.validation.pattern = selectedValidationType.pattern;
-        $scope.propertySettings.showValidationPattern = true;
+      if(selectedValidationType) {
+         $scope.model.property.validation.pattern = selectedValidationType.pattern;
+         $scope.propertySettings.showValidationPattern = true;
+      } else {
+         $scope.propertySettings.showValidationPattern = false;
+      }
     }
 
     activate();