From b3653e840f54ab26e8bee59e2a6a75883b6082b5 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 25 Aug 2015 10:15:38 +0200
Subject: [PATCH] Switch back to ng-if on elements in header, and accept
 $parent, to prevent unwanted watchers to make sure focus directive works as
 it should. This should be possible to change from angular v 1.3.

---
 .../src/views/components/editor/umb-editor-header.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
index 06b0eccfc8..af83fd7adb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
@@ -4,9 +4,9 @@
 
         <div class="umb-panel-meta" ng-class="{'-top-position': tabs }">
 
-            <div class="umb-panel-header-icon" ng-show="icon!==undefined" ng-click="openIconPicker()" ng-class="{'-placeholder': icon==='' || icon===null}">
-                <i class="icon {{icon}}"  ng-if="icon!=='' && icon!==null"></i>
-                <div class="umb-panel-header-icon-text" ng-if="icon==='' || icon===null">Add icon</div>
+            <div class="umb-panel-header-icon" ng-if="icon!==undefined" ng-click="openIconPicker()" ng-class="{'-placeholder': $parent.icon==='' || $parent.icon===null}">
+                <i class="icon {{$parent.icon}}"  ng-if="$parent.icon!=='' && $parent.icon!==null"></i>
+                <div class="umb-panel-header-icon-text" ng-if="$parent.icon==='' || $parent.icon===null">Add icon</div>
             </div>
 
             <div class="umb-panel-header-title-wrapper">
@@ -17,11 +17,11 @@
                         ng-model="name">
                 </umb-content-name>
                 -->
-                <input type="text" class="umb-panel-header-name" placeholder="Enter name..." ng-show="name!==undefined" ng-disabled="content.isSystem == 1" ng-model="name"  ng-class="{'name-is-empty': name===null || name===''}" umb-auto-focus />
+                <input type="text" class="umb-panel-header-name" placeholder="Enter name..." ng-if="name!==undefined" ng-disabled="content.isSystem == 1" ng-model="$parent.name"  ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}" umb-auto-focus />
 
                 <umb-generate-alias class="umb-panel-header-alias" ng-if="alias!==undefined" alias="$parent.alias" alias-from="$parent.name" enable-lock="true"></umb-generate-alias>
 
-                <input type="text" class="umb-panel-header-description" placeholder="Enter description..." ng-show="description!==undefined" ng-model="description" />
+                <input type="text" class="umb-panel-header-description" placeholder="Enter description..." ng-if="description!==undefined" ng-model="$parent.description" />
 
             </div>