Skip to content

Commit

Permalink
Fixed #1710
Browse files Browse the repository at this point in the history
  • Loading branch information
Çağatay Çivici committed Dec 30, 2016
1 parent 29d5d48 commit e66afae
Show file tree
Hide file tree
Showing 39 changed files with 171 additions and 171 deletions.
2 changes: 1 addition & 1 deletion components/accordion/accordion.ts
View file
Expand Up @@ -45,7 +45,7 @@ export class Accordion implements BlockableUI {
<span class="fa fa-fw" [ngClass]="{'fa-caret-down': selected, 'fa-caret-right': !selected}"></span>
<a href="#" *ngIf="!hasHeaderFacet" role="tab" [attr.aria-expanded]="selected" [attr.aria-selected]="selected">{{header}}</a>
<a href="#" *ngIf="hasHeaderFacet" role="tab" [attr.aria-expanded]="selected" [attr.aria-selected]="selected">
<ng-content select="header"></ng-content>
<ng-content select="p-header"></ng-content>
</a>
</div>
<div class="ui-accordion-content-wrapper" [@tabContent]="selected ? 'visible' : 'hidden'"
Expand Down
4 changes: 2 additions & 2 deletions components/common/shared.ts
View file
Expand Up @@ -3,13 +3,13 @@ import {CommonModule} from '@angular/common';
import {Component} from '@angular/core';

@Component({
selector: 'header',
selector: 'p-header',
template: '<ng-content></ng-content>'
})
export class Header {}

@Component({
selector: 'footer',
selector: 'p-footer',
template: '<ng-content></ng-content>'
})
export class Footer {}
Expand Down
2 changes: 1 addition & 1 deletion components/confirmdialog/confirmdialog.ts
View file
Expand Up @@ -22,7 +22,7 @@ import {Subscription} from 'rxjs/Subscription';
<span class="ui-confirmdialog-message">{{message}}</span>
</div>
<div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" *ngIf="footer">
<ng-content select="footer"></ng-content>
<ng-content select="p-footer"></ng-content>
</div>
<div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" *ngIf="!footer">
<button type="button" pButton [icon]="rejectIcon" [label]="rejectLabel" (click)="reject()" *ngIf="rejectVisible"></button>
Expand Down
4 changes: 2 additions & 2 deletions components/datagrid/datagrid.ts
View file
Expand Up @@ -10,7 +10,7 @@ import {BlockableUI} from '../common/api';
template: `
<div [ngClass]="'ui-datagrid ui-widget'" [ngStyle]="style" [class]="styleClass">
<div class="ui-datagrid-header ui-widget-header ui-corner-top" *ngIf="header">
<ng-content select="header"></ng-content>
<ng-content select="p-header"></ng-content>
</div>
<p-paginator [rows]="rows" [first]="first" [totalRecords]="totalRecords" [pageLinkSize]="pageLinks"
(onPageChange)="paginate($event)" styleClass="ui-paginator-bottom" [rowsPerPageOptions]="rowsPerPageOptions" *ngIf="paginator && paginatorPosition!='bottom' || paginatorPosition =='both'"></p-paginator>
Expand All @@ -22,7 +22,7 @@ import {BlockableUI} from '../common/api';
<p-paginator [rows]="rows" [first]="first" [totalRecords]="totalRecords" [pageLinkSize]="pageLinks"
(onPageChange)="paginate($event)" styleClass="ui-paginator-bottom" [rowsPerPageOptions]="rowsPerPageOptions" *ngIf="paginator && paginatorPosition!='top' || paginatorPosition =='both'"></p-paginator>
<div class="ui-datagrid-footer ui-widget-header ui-corner-top" *ngIf="footer">
<ng-content select="footer"></ng-content>
<ng-content select="p-footer"></ng-content>
</div>
</div>
`
Expand Down
4 changes: 2 additions & 2 deletions components/datalist/datalist.ts
View file
Expand Up @@ -11,7 +11,7 @@ import {BlockableUI} from '../common/api';
template: `
<div [ngClass]="'ui-datalist ui-widget'" [ngStyle]="style" [class]="styleClass">
<div class="ui-datalist-header ui-widget-header ui-corner-top" *ngIf="header">
<ng-content select="header"></ng-content>
<ng-content select="p-header"></ng-content>
</div>
<p-paginator [rows]="rows" [first]="first" [totalRecords]="totalRecords" [pageLinkSize]="pageLinks"
(onPageChange)="paginate($event)" styleClass="ui-paginator-bottom" [rowsPerPageOptions]="rowsPerPageOptions" *ngIf="paginator && paginatorPosition!='bottom' || paginatorPosition =='both'"></p-paginator>
Expand All @@ -25,7 +25,7 @@ import {BlockableUI} from '../common/api';
<p-paginator [rows]="rows" [first]="first" [totalRecords]="totalRecords" [pageLinkSize]="pageLinks"
(onPageChange)="paginate($event)" styleClass="ui-paginator-bottom" [rowsPerPageOptions]="rowsPerPageOptions" *ngIf="paginator && paginatorPosition!='top' || paginatorPosition =='both'"></p-paginator>
<div class="ui-datalist-footer ui-widget-header ui-corner-bottom" *ngIf="footer">
<ng-content select="footer"></ng-content>
<ng-content select="p-footer"></ng-content>
</div>
</div>
`
Expand Down
4 changes: 2 additions & 2 deletions components/datascroller/datascroller.ts
View file
Expand Up @@ -10,7 +10,7 @@ import {DomHandler} from '../dom/domhandler';
template: `
<div [ngClass]="{'ui-datascroller ui-widget': true, 'ui-datascroller-inline': inline}" [ngStyle]="style" [class]="styleClass">
<div class="ui-datascroller-header ui-widget-header ui-corner-top" *ngIf="header">
<ng-content select="header"></ng-content>
<ng-content select="p-header"></ng-content>
</div>
<div class="ui-datascroller-content ui-widget-content" [ngStyle]="{'max-height': scrollHeight}">
<ul class="ui-datascroller-list">
Expand All @@ -20,7 +20,7 @@ import {DomHandler} from '../dom/domhandler';
</ul>
</div>
<div class="ui-datascroller-footer ui-widget-header ui-corner-bottom" *ngIf="footer">
<ng-content select="footer"></ng-content>
<ng-content select="p-footer"></ng-content>
</div>
</div>
`,
Expand Down
4 changes: 2 additions & 2 deletions components/datatable/datatable.ts
View file
Expand Up @@ -97,7 +97,7 @@ export class RowExpansionLoader {
<div [ngStyle]="style" [class]="styleClass"
[ngClass]="{'ui-datatable ui-widget':true,'ui-datatable-reflow':responsive,'ui-datatable-stacked':stacked,'ui-datatable-resizable':resizableColumns,'ui-datatable-scrollable':scrollable}">
<div class="ui-datatable-header ui-widget-header" *ngIf="header" [ngStyle]="{'width': scrollWidth}">
<ng-content select="header"></ng-content>
<ng-content select="p-header"></ng-content>
</div>
<p-paginator [rows]="rows" [first]="first" [totalRecords]="totalRecords" [pageLinkSize]="pageLinks" styleClass="ui-paginator-bottom"
(onPageChange)="paginate($event)" [rowsPerPageOptions]="rowsPerPageOptions" *ngIf="paginator && paginatorPosition!='bottom' || paginatorPosition =='both'"></p-paginator>
Expand Down Expand Up @@ -295,7 +295,7 @@ export class RowExpansionLoader {
<p-paginator [rows]="rows" [first]="first" [totalRecords]="totalRecords" [pageLinkSize]="pageLinks" styleClass="ui-paginator-bottom"
(onPageChange)="paginate($event)" [rowsPerPageOptions]="rowsPerPageOptions" *ngIf="paginator && paginatorPosition!='top' || paginatorPosition =='both'"></p-paginator>
<div class="ui-datatable-footer ui-widget-header" *ngIf="footer">
<ng-content select="footer"></ng-content>
<ng-content select="p-footer"></ng-content>
</div>
</div>
`,
Expand Down
4 changes: 2 additions & 2 deletions components/dialog/dialog.ts
View file
Expand Up @@ -12,7 +12,7 @@ import {Header,SharedModule} from '../common/shared';
(mousedown)="initDrag($event)" (mouseup)="endDrag($event)" *ngIf="showHeader">
<span class="ui-dialog-title" *ngIf="header">{{header}}</span>
<span class="ui-dialog-title" *ngIf="headerFacet">
<ng-content select="header"></ng-content>
<ng-content select="p-header"></ng-content>
</span>
<a *ngIf="closable" [ngClass]="{'ui-dialog-titlebar-icon ui-dialog-titlebar-close ui-corner-all':true}" href="#" role="button" (click)="hide($event)">
<span class="fa fa-fw fa-close"></span>
Expand All @@ -21,7 +21,7 @@ import {Header,SharedModule} from '../common/shared';
<div #content class="ui-dialog-content ui-widget-content" [style.height.px]="contentHeight">
<ng-content></ng-content>
</div>
<ng-content select="footer"></ng-content>
<ng-content select="p-footer"></ng-content>
<div *ngIf="resizable" class="ui-resizable-handle ui-resizable-se ui-icon ui-icon-gripsmall-diagonal-se" style="z-index: 90;"
(mousedown)="initResize($event)"></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/editor/editor.ts
View file
Expand Up @@ -17,7 +17,7 @@ export const EDITOR_VALUE_ACCESSOR: any = {
template: `
<div [ngClass]="'ui-widget ui-editor-container ui-corner-all'" [class]="styleClass">
<div class="ui-editor-toolbar ui-widget-header ui-corner-top" *ngIf="toolbar">
<ng-content select="header"></ng-content>
<ng-content select="p-header"></ng-content>
</div>
<div class="ui-editor-toolbar ui-widget-header ui-corner-top" *ngIf="!toolbar">
<span class="ql-formats">
Expand Down
2 changes: 1 addition & 1 deletion components/panel/panel.ts
View file
Expand Up @@ -8,7 +8,7 @@ import {BlockableUI} from '../common/api';
<div [ngClass]="'ui-panel ui-widget ui-widget-content ui-corner-all'" [ngStyle]="style" [class]="styleClass">
<div class="ui-panel-titlebar ui-widget-header ui-helper-clearfix ui-corner-all">
<span class="ui-panel-title" *ngIf="header">{{header}}</span>
<ng-content select="header"></ng-content>
<ng-content select="p-header"></ng-content>
<a *ngIf="toggleable" class="ui-panel-titlebar-icon ui-panel-titlebar-toggler ui-corner-all ui-state-default" href="#"
(click)="toggle($event)">
<span class="fa fa-fw" [ngClass]="{'fa-minus': !collapsed,'fa-plus':collapsed}"></span>
Expand Down
4 changes: 2 additions & 2 deletions components/treetable/treetable.ts
View file
Expand Up @@ -80,7 +80,7 @@ export class UITreeRow {
template: `
<div [ngClass]="'ui-treetable ui-widget'" [ngStyle]="style" [class]="styleClass">
<div class="ui-treetable-header ui-widget-header" *ngIf="header">
<ng-content select="header"></ng-content>
<ng-content select="p-header"></ng-content>
</div>
<div class="ui-treetable-tablewrapper">
<table class="ui-widget-content">
Expand Down Expand Up @@ -109,7 +109,7 @@ export class UITreeRow {
</table>
</div>
<div class="ui-treetable-footer ui-widget-header" *ngIf="footer">
<ng-content select="footer"></ng-content>
<ng-content select="p-footer"></ng-content>
</div>
</div>
`
Expand Down
4 changes: 2 additions & 2 deletions showcase/demo/accordion/accordiondemo.html
View file
Expand Up @@ -146,9 +146,9 @@ <h3>Custom Content at Headers</h3>
<pre>
<code class="language-markup" pCode>
&lt;p-accordionTab&gt;
&lt;header&gt;
&lt;p-header&gt;
Header Content
&lt;/header&gt;
&lt;/p-header&gt;
Body Content
&lt;/p-accordionTab&gt;
</code>
Expand Down
4 changes: 2 additions & 2 deletions showcase/demo/confirmdialog/confirmdialogdemo.html
View file
Expand Up @@ -113,10 +113,10 @@ <h3>Customization</h3>
<pre>
<code class="language-markup" pCode>
&lt;p-confirmDialog header="Confirmation" icon="fa fa-question-circle" width="425" #cd&gt;
&lt;footer&gt;
&lt;p-footer&gt;
&lt;button type="button" pButton icon="fa-close" label="No" (click)="cd.reject()"&gt;&lt;/button&gt;
&lt;button type="button" pButton icon="fa-check" label="Yes" (click)="cd.accept()"&gt;&lt;/button&gt;
&lt;/footer&gt;
&lt;/p-footer&gt;
&lt;/p-confirmDialog&gt;
</code>
</pre>
Expand Down
12 changes: 6 additions & 6 deletions showcase/demo/datagrid/datagriddemo.html
View file
Expand Up @@ -7,9 +7,9 @@

<div class="content-section implementation">
<p-dataGrid [value]="cars" [paginator]="true" [rows]="20">
<header>
<p-header>
List of Cars
</header>
</p-header>
<template let-car>
<div style="padding:3px" class="ui-g-12 ui-md-3">
<p-panel [header]="car.vin" [style]="{'text-align':'center'}">
Expand Down Expand Up @@ -146,8 +146,8 @@ <h3>Facets</h3>
<pre>
<code class="language-markup" pCode>
&lt;p-dataGrid [value]="cars"&gt;
&lt;header&gt;List of Cars&lt;/header&gt;
&lt;footer&gt;Choose from the list.&lt;/footer&gt;
&lt;p-header&gt;List of Cars&lt;/p-header&gt;
&lt;p-footer&gt;Choose from the list.&lt;/p-footer&gt;
&lt;template let-car&gt;
&lt;div class="ui-g-12 ui-md-3"&gt;
Car content
Expand Down Expand Up @@ -338,9 +338,9 @@ <h3>Dependencies</h3>
<pre>
<code class="language-markup" pCode ngNonBindable>
&lt;p-dataGrid [value]="cars" [paginator]="true" [rows]="20"&gt;
&lt;header&gt;
&lt;p-header&gt;
List of Cars
&lt;/header&gt;
&lt;/p-header&gt;
&lt;template let-car&gt;
&lt;div style="padding:3px" class="ui-g-12 ui-md-3"&gt;
&lt;p-panel [header]="car.vin" [paginator]="true" [style]="&#123;'text-align':'center'&#125;"&gt;
Expand Down
12 changes: 6 additions & 6 deletions showcase/demo/datalist/datalistdemo.html
View file
Expand Up @@ -7,9 +7,9 @@

<div class="content-section implementation">
<p-dataList [value]="cars" [paginator]="true" [rows]="5">
<header>
<p-header>
List of Cars
</header>
</p-header>
<template let-car>
<div class="ui-grid ui-grid-responsive ui-fluid" style="font-size:16px;padding:20px;border-bottom:1px solid #D5D5D5;">
<div class="ui-grid-row">
Expand Down Expand Up @@ -161,8 +161,8 @@ <h3>Facets</h3>
<pre>
<code class="language-markup" pCode>
&lt;p-dataList [value]="cars"&gt;
&lt;header&gt;List of Cars&lt;/header&gt;
&lt;footer&gt;Choose from the list.&lt;/footer&gt;
&lt;p-header&gt;List of Cars&lt;/p-header&gt;
&lt;p-footer&gt;Choose from the list.&lt;/p-footer&gt;
&lt;template let-car&gt;
Car content
&lt;/template&gt;
Expand Down Expand Up @@ -348,9 +348,9 @@ <h3>Dependencies</h3>
<pre>
<code class="language-markup" pCode ngNonBindable>
&lt;p-dataList [value]="cars" [paginator]="true" [rows]="5"&gt;
&lt;header&gt;
&lt;p-header&gt;
List of Cars
&lt;/header&gt;
&lt;/p-header&gt;
&lt;template let-car&gt;
&lt;div class="ui-grid ui-grid-responsive ui-fluid" style="font-size:16px;padding:20px;border-bottom:1px solid #D5D5D5;"&gt;
&lt;div class="ui-grid-row"&gt;
Expand Down
12 changes: 6 additions & 6 deletions showcase/demo/datascroller/datascrollerdemo.html
View file
Expand Up @@ -9,9 +9,9 @@

<div class="content-section implementation">
<p-dataScroller [value]="cars" [rows]="10" [buffer]="0.4">
<header>
<p-header>
Scroll Down to to Load More
</header>
</p-header>
<template let-car>
<li style="border-bottom:1px solid #D5D5D5;">
<div class="ui-grid ui-grid-responsive ui-fluid" style="font-size:16px;padding:20px">
Expand Down Expand Up @@ -154,8 +154,8 @@ <h3>Facets</h3>
<pre>
<code class="language-markup" pCode>
&lt;p-dataScroller [value]="cars" [rows]="10"&gt;
&lt;header&gt;List of Cars&lt;/header&gt;
&lt;footer&gt;Choose from the list.&lt;/footer&gt;
&lt;p-header&gt;List of Cars&lt;/p-header&gt;
&lt;p-footer&gt;Choose from the list.&lt;/p-footer&gt;
&lt;template let-car&gt;
Car content
&lt;/template&gt;
Expand Down Expand Up @@ -342,9 +342,9 @@ <h3>Dependencies</h3>
<pre>
<code class="language-markup" pCode ngNonBindable>
&lt;p-dataScroller [value]="cars" [rows]="10" [buffer]="0.4"&gt;
&lt;header&gt;
&lt;p-header&gt;
Scroll Down to to Load More
&lt;/header&gt;
&lt;/p-header&gt;
&lt;template let-car&gt;
&lt;div class="ui-grid ui-grid-responsive ui-fluid" style="font-size:16px;padding:20px;border-bottom:1px solid #D5D5D5;"&gt;
&lt;div class="ui-grid-row"&gt;
Expand Down
8 changes: 4 additions & 4 deletions showcase/demo/datascroller/datascrollerinfinitedemo.html
View file
Expand Up @@ -47,9 +47,9 @@
&lt;p-growl [value]="msgs"&gt;&lt;/p-growl&gt;

&lt;p-dataScroller [value]="cars" [rows]="10" (onLazyLoad)="loadData($event)" [lazy]="true"&gt;
&lt;header&gt;
&lt;p-header&gt;
Scroll Down to to Load More
&lt;/header&gt;
&lt;/p-header&gt;
&lt;template let-car&gt;
&lt;div class="ui-grid ui-grid-responsive ui-fluid" style="font-size:16px;padding:20px;border-bottom:1px solid #D5D5D5"&gt;
&lt;div class="ui-grid-row"&gt;
Expand Down Expand Up @@ -88,9 +88,9 @@
<p-growl [value]="msgs"></p-growl>

<p-dataScroller [value]="cars" [rows]="10" (onLazyLoad)="loadData($event)" [lazy]="true">
<header>
<p-header>
Scroll Down to to Load More
</header>
</p-header>
<template let-car>
<div class="ui-grid ui-grid-responsive ui-fluid" style="font-size:16px;padding:20px;border-bottom:1px solid #D5D5D5">
<div class="ui-grid-row">
Expand Down
8 changes: 4 additions & 4 deletions showcase/demo/datascroller/datascrollerinlinedemo.html
View file
Expand Up @@ -9,9 +9,9 @@

<div class="content-section implementation">
<p-dataScroller [value]="cars" [rows]="10" [inline]="true" scrollHeight="500px">
<header>
<p-header>
Scroll Down to to Load More
</header>
</p-header>
<template let-car>
<div class="ui-grid ui-grid-responsive ui-fluid" style="font-size:16px;padding:20px;border-bottom:1px solid #D5D5D5;">
<div class="ui-grid-row">
Expand Down Expand Up @@ -102,9 +102,9 @@
<pre>
<code class="language-markup" pCode ngNonBindable>
&lt;p-dataScroller [value]="cars" [rows]="10" [inline]="true" scrollHeight="500px"&gt;
&lt;header&gt;
&lt;p-header&gt;
Scroll Down to to Load More
&lt;/header&gt;
&lt;/p-header&gt;
&lt;template let-car&gt;
&lt;div class="ui-grid ui-grid-responsive ui-fluid" style="font-size:16px;padding:20px;border-bottom:1px solid #D5D5D5"&gt;
&lt;div class="ui-grid-row"&gt;
Expand Down
16 changes: 8 additions & 8 deletions showcase/demo/datascroller/datascrollerloaderdemo.html
View file
Expand Up @@ -9,9 +9,9 @@

<div class="content-section implementation">
<p-dataScroller [value]="cars" [rows]="5" [loader]="loadButton">
<header>
<p-header>
Click Load Button at Footer to Load More
</header>
</p-header>
<template let-car>
<div class="ui-grid ui-grid-responsive ui-fluid" style="font-size:16px;padding:20px;border-bottom:1px solid #D5D5D5">
<div class="ui-grid-row">
Expand Down Expand Up @@ -39,9 +39,9 @@
</div>
</div>
</template>
<footer>
<p-footer>
<button #loadButton type="text" icon="fa-refresh" pButton label="Load"></button>
</footer>
</p-footer>
</p-dataScroller>

<p-dialog header="Car Details" [(visible)]="displayDialog" [responsive]="true" showEffect="fade" [modal]="true" width="225" (onAfterHide)="onDialogHide()">
Expand Down Expand Up @@ -105,9 +105,9 @@
<pre>
<code class="language-markup" pCode ngNonBindable>
&lt;p-dataScroller [value]="cars" [rows]="5" [loader]="loadButton"&gt;
&lt;header&gt;
&lt;p-header&gt;
Click Load Button at Footer to Load More
&lt;/header&gt;
&lt;/p-header&gt;
&lt;template let-car&gt;
&lt;div class="ui-grid ui-grid-responsive ui-fluid" style="font-size:16px;padding:20px;border-bottom:1px solid #D5D5D5"&gt;
&lt;div class="ui-grid-row"&gt;
Expand Down Expand Up @@ -135,9 +135,9 @@
&lt;/div&gt;
&lt;/div&gt;
&lt;/template&gt;
&lt;footer&gt;
&lt;p-footer&gt;
&lt;button #loadButton type="text" icon="fa-refresh" pButton label="Load"&gt;&lt;/button&gt;
&lt;/footer&gt;
&lt;/p-footer&gt;
&lt;/p-dataScroller&gt;

&lt;p-dialog header="Car Details" [(visible)]="displayDialog" [responsive]="true" showEffect="fade" [modal]="true" width="225" (onAfterHide)="onDialogHide()"&gt;
Expand Down

0 comments on commit e66afae

Please sign in to comment.