Fixes umb-editor-header to toggle visibility of certain fields based on boolean toggles since we cannot rely on model values being undefined when there are validators present because validators change the model value to undefined.

This commit is contained in:
Shannon
2015-09-24 15:53:24 +02:00
parent 1410a2d482
commit 5fff1e4ac5
10 changed files with 46 additions and 13 deletions

View File

@@ -46,8 +46,11 @@
nameLocked: "=",
menu: "=",
icon: "=",
hideIcon: "@",
alias: "=",
hideAlias: "@",
description: "=",
hideDescription: "@",
navigation: "="
},
link: link

View File

@@ -12,7 +12,10 @@
<umb-editor-header
name="dashboard.name"
name-locked="page.nameLocked"
tabs="dashboard.tabs">
tabs="dashboard.tabs"
hide-icon="true"
hide-description="true"
hide-alias="true">
</umb-editor-header>
<umb-editor-container>

View File

@@ -6,19 +6,25 @@
<div class="umb-panel-header-left-side">
<div class="umb-panel-header-icon" ng-if="icon!==undefined" ng-click="openIconPicker()" ng-class="{'-placeholder': $parent.icon==='' || $parent.icon===null}">
<div class="umb-panel-header-icon" ng-if="!hideIcon" 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">
<input type="text" class="umb-panel-header-name-input" placeholder="Enter name..." ng-if="name!==undefined && !nameLocked" ng-model="$parent.name" ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}" umb-auto-focus focus-on-filled="true" />
<div class="umb-panel-header-name" ng-if="name!==undefined && nameLocked">{{ name }}</div>
<input type="text" class="umb-panel-header-name-input" placeholder="Enter name..."
ng-if="!nameLocked"
ng-model="$parent.name"
ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
umb-auto-focus
focus-on-filled="true"
required />
<div class="umb-panel-header-name" ng-if="nameLocked">{{ name }}</div>
<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>
<umb-generate-alias class="umb-panel-header-alias" ng-if="!hideAlias" 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-if="description!==undefined" ng-model="$parent.description" />
<input type="text" class="umb-panel-header-description" placeholder="Enter description..." ng-if="!hideDescription" ng-model="$parent.description" />
</div>

View File

@@ -13,7 +13,10 @@
<umb-editor-header
menu="page.menu"
name="content.name"
tabs="content.tabs">
tabs="content.tabs"
hide-icon="true"
hide-description="true"
hide-alias="true">
</umb-editor-header>

View File

@@ -2,7 +2,10 @@
<umb-editor-header
name="page.name"
name-locked="page.nameLocked">
name-locked="page.nameLocked"
hide-icon="true"
hide-description="true"
hide-alias="true" >
</umb-editor-header>
<umb-editor-container>

View File

@@ -13,7 +13,10 @@
<umb-editor-header
menu="page.menu"
name="content.name"
name-locked="page.nameLocked">
name-locked="page.nameLocked"
hide-icon="true"
hide-description="true"
hide-alias="true">
</umb-editor-header>

View File

@@ -12,7 +12,10 @@
<umb-editor-header
name="content.name"
tabs="content.tabs"
menu="page.menu">
menu="page.menu"
hide-icon="true"
hide-description="true"
hide-alias="true">
</umb-editor-header>
<umb-editor-container>

View File

@@ -2,7 +2,10 @@
<umb-editor-header
name="page.name"
name-locked="page.nameLocked">
name-locked="page.nameLocked"
hide-icon="true"
hide-description="true"
hide-alias="true">
</umb-editor-header>
<umb-editor-container>

View File

@@ -13,7 +13,10 @@
name="content.name"
name-locked="page.nameLocked"
tabs="content.tabs"
menu="page.menu">
menu="page.menu"
hide-icon="true"
hide-description="true"
hide-alias="true">
</umb-editor-header>
<umb-editor-container>

View File

@@ -10,7 +10,10 @@
name="content.name"
name-locked="page.lockedName"
tabs="content.tabs"
menu="page.menu">
menu="page.menu"
hide-icon="true"
hide-description="true"
hide-alias="true">
</umb-editor-header>
<umb-editor-container>