Merge pull request #5 from primefaces/master

latest
primefaces · Jun 16, 2017 · 95af3d7 · 95af3d7
2 parents 4dae6cf + 965302b
commit 95af3d7
Show file tree

Hide file tree

Showing 173 changed files with 1,324 additions and 725 deletions.
diff --git a/.angular-cli.json b/.angular-cli.json
@@ -9,6 +9,7 @@
       "outDir": "dist",
       "assets": [
         "assets",
+        "upload.php",
         "favicon.png"
       ],
       "index": "index.html",
@@ -19,10 +20,10 @@
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
       "styles": [
-        "styles.css",
         "../node_modules/fullcalendar/dist/fullcalendar.min.css",
         "../node_modules/quill/dist/quill.snow.css",
-        "../node_modules/font-awesome/css/font-awesome.min.css"
+        "../node_modules/font-awesome/css/font-awesome.min.css",
+        "styles.css"
       ],
       "scripts": [
         "../node_modules/jquery/dist/jquery.js",

diff --git a/primeng.js b/primeng.js
@@ -48,6 +48,7 @@ __export(require("./components/menubar/menubar"));
 __export(require("./components/messages/messages"));
 __export(require("./components/multiselect/multiselect"));
 __export(require("./components/orderlist/orderlist"));
+__export(require("./components/organizationchart/organizationchart"));
 __export(require("./components/overlaypanel/overlaypanel"));
 __export(require("./components/paginator/paginator"));
 __export(require("./components/panel/panel"));

diff --git a/src/app/components/autocomplete/autocomplete.ts b/src/app/components/autocomplete/autocomplete.ts
@@ -95,6 +95,8 @@ export class AutoComplete implements AfterViewInit,AfterViewChecked,ControlValue
     @Output() onBlur: EventEmitter<any> = new EventEmitter();
 
     @Output() onDropdownClick: EventEmitter<any> = new EventEmitter();
+
+	@Output() onClear: EventEmitter<any> = new EventEmitter();
 
     @Input() field: string;
 
@@ -260,6 +262,7 @@ export class AutoComplete implements AfterViewInit,AfterViewChecked,ControlValue
 
         if(value.length === 0) {
            this.hide();
+		   this.onClear.emit(event);
         }
 
         if(value.length >= this.minLength) {
@@ -531,4 +534,4 @@ export class AutoComplete implements AfterViewInit,AfterViewChecked,ControlValue
     exports: [AutoComplete,SharedModule],
     declarations: [AutoComplete]
 })
-export class AutoCompleteModule { }
+export class AutoCompleteModule { }
diff --git a/src/app/components/button/button.css b/src/app/components/button/button.css
@@ -124,11 +124,15 @@ button.ui-button::-moz-focus-inner {
 .ui-splitbutton.ui-button-secondary .ui-button:enabled:hover,
 .ui-splitbutton.ui-button-secondary .ui-button:focus {
     background-color: #f2f2f2;
+    border-color: #cccccc;
+    color: #373a3c;
 }
 
 .ui-button.ui-button-secondary:enabled:active,
 .ui-splitbutton.ui-button-secondary .ui-button:enabled:active  {
     background-color: #e6e6e6;
+    border-color: #cccccc;
+    color: #373a3c;
 }
 
 /* Success */
@@ -144,11 +148,13 @@ button.ui-button::-moz-focus-inner {
 .ui-splitbutton.ui-button-success .ui-button:enabled:hover,
 .ui-splitbutton.ui-button-success .ui-button:focus {
     background-color: #4cae4c;
+    border-color: #5cb85c;
 }
 
 .ui-button.ui-button-success:enabled:active,
 .ui-splitbutton.ui-button-success .ui-button:enabled:active {
     background-color: #449d44;
+    border-color: #5cb85c;
 }
 
 /* Info */
@@ -164,11 +170,13 @@ button.ui-button::-moz-focus-inner {
 .ui-splitbutton.ui-button-info .ui-button:enabled:hover,
 .ui-splitbutton.ui-button-info .ui-button:focus {
     background-color: #46b8da;
+    border-color: #5bc0de;
 }
 
 .ui-button.ui-button-info:enabled:active,
 .ui-splitbutton.ui-button-info .ui-button:enabled:active {
     background-color: #31b0d5;
+    border-color: #5bc0de;
 }
 
 /* Warning */
@@ -184,11 +192,13 @@ button.ui-button::-moz-focus-inner {
 .ui-splitbutton.ui-button-warning .ui-button:enabled:hover,
 .ui-splitbutton.ui-button-warning .ui-button:focus {
     background-color: #eea236;
+    border-color: #f0ad4e;
 }
 
 .ui-button.ui-button-warning:enabled:active,
 .ui-splitbutton.ui-button-warning .ui-button:enabled:active {
     background-color: #ec971f;
+    border-color: #f0ad4e;
 }
 
 /* Danger */
@@ -204,9 +214,11 @@ button.ui-button::-moz-focus-inner {
 .ui-splitbutton.ui-button-danger .ui-button:enabled:hover,
 .ui-splitbutton.ui-button-danger .ui-button:focus {
     background-color: #d43f3a;
+    border-color: #d9534f;
 }
 
 .ui-button.ui-button-danger:enabled:active,
 .ui-splitbutton.ui-button-danger .ui-button:enabled:active {
     background-color: #c9302c;
+    border-color: #d9534f;
 }
diff --git a/src/app/components/captcha/captcha.ts b/src/app/components/captcha/captcha.ts
@@ -1,9 +1,9 @@
-import {NgModule,AfterViewInit,Component,EventEmitter,Input,NgZone,OnDestroy,Output,ViewChild, ElementRef} from '@angular/core';
+import {NgModule,AfterViewInit,Component,EventEmitter,Input,NgZone,OnDestroy,Output,ElementRef} from '@angular/core';
 import {CommonModule} from '@angular/common';
 
 @Component({
     selector: 'p-captcha',
-    template: `<div #target></div>`
+    template: `<div></div>`
 })
 export class Captcha implements AfterViewInit {
 
@@ -24,16 +24,15 @@ export class Captcha implements AfterViewInit {
     @Output() onResponse: EventEmitter<any> = new EventEmitter();
 
     @Output() onExpire: EventEmitter<any> = new EventEmitter();
-
-    @ViewChild('target') el: ElementRef;
 
     private _instance: any = null;
 
-    constructor(public _zone:NgZone) {}
+    constructor(public el: ElementRef, public _zone: NgZone) {}
 
     ngAfterViewInit() {
-        if ((<any>window).grecaptcha)
+        if((<any>window).grecaptcha) {
             this.init();
+        }
         else {
             (<any>window)[this.initCallback] = () => {
               this.init();
@@ -42,7 +41,7 @@ export class Captcha implements AfterViewInit {
     }
 
     init() {
-        this._instance = (<any>window).grecaptcha.render(this.el.nativeElement, {
+        this._instance = (<any>window).grecaptcha.render(this.el.nativeElement.children[0], {
             'sitekey': this.siteKey,
             'theme': this.theme,
             'type': this.type,

diff --git a/src/app/components/carousel/carousel.ts b/src/app/components/carousel/carousel.ts
@@ -10,22 +10,22 @@ import {CommonModule} from '@angular/common';
             <div class="ui-carousel-header ui-widget-header ui-corner-all">
                 <span class="ui-carousel-header-title">{{headerText}}</span>
                 <span class="ui-carousel-button ui-carousel-next-button fa fa-arrow-circle-right" (click)="onNextNav()" 
-                        [ngClass]="{'ui-state-disabled':(page === (totalPages-1)) && !circular}"></span>
+                        [ngClass]="{'ui-state-disabled':(page === (totalPages-1)) && !circular}" *ngIf="value&&value.length"></span>
                 <span class="ui-carousel-button ui-carousel-prev-button fa fa-arrow-circle-left" (click)="onPrevNav()" 
-                        [ngClass]="{'ui-state-disabled':(page === 0 && !circular)}"></span>
+                        [ngClass]="{'ui-state-disabled':(page === 0 && !circular)}" *ngIf="value&&value.length"></span>
                 <div *ngIf="displayPageLinks" class="ui-carousel-page-links">
                     <a href="#" (click)="setPageWithLink($event,i)" class="ui-carousel-page-link fa fa-circle-o" *ngFor="let links of anchorPageLinks;let i=index" [ngClass]="{'fa-dot-circle-o':page===i}"></a>
                 </div>
                 <select *ngIf="displayPageDropdown" class="ui-carousel-dropdown ui-widget ui-state-default ui-corner-left" [value]="page" (change)="onDropdownChange($event.target.value)">
                     <option *ngFor="let option of selectDropdownOptions" [value]="option" [selected]="value == option">{{option+1}}</option>
                 </select>
-                <select *ngIf="responsive" class="ui-carousel-mobiledropdown ui-widget ui-state-default ui-corner-left" [value]="page" (change)="onDropdownChange($event.target.value)"
+                <select *ngIf="responsive&&value&&value.length" class="ui-carousel-mobiledropdown ui-widget ui-state-default ui-corner-left" [value]="page" (change)="onDropdownChange($event.target.value)"
                     [style.display]="shrinked ? 'block' : 'none'">
                     <option *ngFor="let option of mobileDropdownOptions" [value]="option" [selected]="value == option">{{option+1}}</option>
                 </select>
             </div>
-            <div class="ui-carousel-viewport">
-                <ul class="ui-carousel-items" [style.left.px]="left" [style.transitionProperty]="'left'" 
+            <div #viewport class="ui-carousel-viewport">
+                <ul #items class="ui-carousel-items" [style.left.px]="left" [style.transitionProperty]="'left'" 
                             [style.transitionDuration]="effectDuration" [style.transitionTimingFunction]="easing">
                     <li *ngFor="let item of value" class="ui-carousel-item ui-widget-content ui-corner-all">
                         <ng-template [pTemplateWrapper]="itemTemplate" [item]="item"></ng-template>
@@ -63,23 +63,15 @@ export class Carousel implements AfterViewChecked,AfterViewInit,OnDestroy{
     @Input() styleClass: string;
 
     @Output() onPage: EventEmitter<any> = new EventEmitter();
-
-    @ViewChild('container') containerViewChild: ElementRef;
-
+
     @ContentChildren(PrimeTemplate) templates: QueryList<any>;
 
     public _value: any[];
 
     public itemTemplate: TemplateRef<any>;
-
-    public container: any;    
-
+
     public left: any = 0;
-
-    public viewport: any;
-
-    public itemsContainer: any;
-
+
     public items: any;
 
     public columns: any;
@@ -98,6 +90,12 @@ export class Carousel implements AfterViewChecked,AfterViewInit,OnDestroy{
 
     public shrinked: boolean;
 
+    @ViewChild('container') containerViewChild: ElementRef;
+
+    @ViewChild('viewport') viewportViewChild: ElementRef;
+
+    @ViewChild('items') itemsViewChild: ElementRef;
+
     documentResponsiveListener: any;
 
     differ: any;
@@ -148,10 +146,6 @@ export class Carousel implements AfterViewChecked,AfterViewInit,OnDestroy{
     }
 
     ngAfterViewInit() {
-        this.container = this.el.nativeElement.children[0];
-        this.viewport = this.domHandler.findSingle(this.el.nativeElement, 'div.ui-carousel-viewport');
-        this.itemsContainer = this.domHandler.findSingle(this.el.nativeElement, 'ul.ui-carousel-items');    
-
         if(this.responsive) {
             this.documentResponsiveListener = this.renderer.listen('window', 'resize', (event) => {
                 this.updateState();
@@ -185,12 +179,12 @@ export class Carousel implements AfterViewChecked,AfterViewInit,OnDestroy{
             this.stopAutoplay();
         }
 
-        this.items = this.domHandler.find(this.itemsContainer,'li');
+        this.items = this.domHandler.find(this.itemsViewChild.nativeElement, 'li');
         this.calculateColumns();
         this.calculateItemWidths();
 
         if(!this.responsive) {
-            this.container.style.width = (this.domHandler.width(this.container)) + 'px';
+            this.containerViewChild.nativeElement.style.width = (this.domHandler.width(this.containerViewChild.nativeElement)) + 'px';
         }
 
         if(this.autoplayInterval) {
@@ -207,7 +201,7 @@ export class Carousel implements AfterViewChecked,AfterViewInit,OnDestroy{
         let firstItem = (this.items && this.items.length) ? this.items[0] : null;
         if(firstItem) {
             for (let i = 0; i < this.items.length; i++) {
-                this.items[i].style.width = ((this.domHandler.innerWidth(this.viewport) - (this.domHandler.getHorizontalMargin(firstItem) * this.columns)) / this.columns) + 'px';
+                this.items[i].style.width = ((this.domHandler.innerWidth(this.viewportViewChild.nativeElement) - (this.domHandler.getHorizontalMargin(firstItem) * this.columns)) / this.columns) + 'px';
             }
         }
     }
@@ -248,7 +242,7 @@ export class Carousel implements AfterViewChecked,AfterViewInit,OnDestroy{
     setPage(p, enforce?: boolean) {
         if(p !== this.page || enforce) {
             this.page = p;
-            this.left = (-1 * (this.domHandler.innerWidth(this.viewport) * this.page));
+            this.left = (-1 * (this.domHandler.innerWidth(this.viewportViewChild.nativeElement) * this.page));
             this.firstVisible = this.page * this.columns;
             this.onPage.emit({
                 page: this.page

diff --git a/src/app/components/checkbox/checkbox.css b/src/app/components/checkbox/checkbox.css
@@ -16,7 +16,6 @@
 }
 
 .ui-chkbox .ui-chkbox-icon {
-    line-height: inherit;
     display: block;
 }
 

diff --git a/src/app/components/common/shared.ts b/src/app/components/common/shared.ts
@@ -28,13 +28,7 @@ export class PrimeTemplate {
     constructor(public template: TemplateRef<any>) {}
 
     getType(): string {
-        if(this.type) {
-            console.log('Defining a pTemplate with type property is deprecated use pTemplate="type" instead.');
-            return this.type;
-        }
-        else {
-            return this.name;
-        }
+        return this.name;
     }
 }
 

diff --git a/src/app/components/datatable/datatable.css b/src/app/components/datatable/datatable.css
@@ -125,7 +125,14 @@
 
 .ui-datatable .ui-paginator {
     padding: .125em;
-    border-top: 0 none;
+}
+
+.ui-datatable .ui-paginator-top {
+    border-bottom-width: 0;
+}
+
+.ui-datatable .ui-paginator-bottom {
+    border-top-width: 0;
 }
 
 .ui-datatable-rtl {
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ @@
     }
     .ui-chkbox .ui-chkbox-icon {
-        line-height: inherit;
         display: block;
     }
@@ Expand Down @@