From 1cd2dc8a42dc63c3b532d065060143007d93c8fb Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 15 Jul 2013 16:52:23 +0200
Subject: [PATCH] Fixes U4-2436 Editing an existing property changes its alias

---
 .../controls/GenericProperties/GenericProperty.ascx       | 8 ++++++--
 .../controls/GenericProperties/GenericProperty.ascx       | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx b/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
index 64cace4a38..b99e16d8fc 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
@@ -61,8 +61,12 @@
 		</div>
 </li>
 <script type="text/javascript">
-    $(function() {
+    $(function () {
         checkAlias('<%=tbAlias.ClientID%>');
-        duplicatePropertyNameAsSafeAlias('<%=tbName.ClientID%>', '<%=tbAlias.ClientID%>')
+        var textbox = $('#<%=tbAlias.ClientID%>');
+        var ul = textbox.closest('ul');
+        if (ul.hasClass('addNewProperty')) {
+            duplicatePropertyNameAsSafeAlias('<%=tbName.ClientID%>', '<%=tbAlias.ClientID%>');
+        }
     });
 </script>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx
index 64cace4a38..b99e16d8fc 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx
@@ -61,8 +61,12 @@
 		</div>
 </li>
 <script type="text/javascript">
-    $(function() {
+    $(function () {
         checkAlias('<%=tbAlias.ClientID%>');
-        duplicatePropertyNameAsSafeAlias('<%=tbName.ClientID%>', '<%=tbAlias.ClientID%>')
+        var textbox = $('#<%=tbAlias.ClientID%>');
+        var ul = textbox.closest('ul');
+        if (ul.hasClass('addNewProperty')) {
+            duplicatePropertyNameAsSafeAlias('<%=tbName.ClientID%>', '<%=tbAlias.ClientID%>');
+        }
     });
 </script>
\ No newline at end of file