yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Mads Rasmussen
2015-08-25 10:15:38 +02:00
parent d1964cee45
commit b3653e840f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
View File

@@ -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>