Fixed #388

primefaces · May 23, 2016 · 1029f8a · 1029f8a
1 parent f51c8f2
commit 1029f8a
Show file tree

Hide file tree

Showing 155 changed files with 467 additions and 544 deletions.
diff --git a/components/api/menumodel.ts b/components/api/menumodel.ts
@@ -4,7 +4,8 @@ export interface MenuItem {
     label?: string;
     icon?: string;
     command?: (event?: any) => void;
-    url?: any;
+    url?: string;
+    routerLink?: any;
     eventEmitter?: EventEmitter<any>;
     items?: MenuItem[];
 }
diff --git a/components/breadcrumb/breadcrumb.ts b/components/breadcrumb/breadcrumb.ts
@@ -1,7 +1,7 @@
 import {Component,Input,OnDestroy,EventEmitter} from '@angular/core';
 import {MenuItem} from '../api/menumodel';
 import {Location} from '@angular/common';
-import {Router} from '@angular/router-deprecated';
+import {Router} from '@angular/router';
 
 @Component({
     selector: 'p-breadcrumb',
@@ -11,7 +11,7 @@ import {Router} from '@angular/router-deprecated';
                 <li class="fa fa-home"></li>
                 <template ngFor let-item let-end="last" [ngForOf]="model">
                     <li role="menuitem">
-                        <a [href]="getItemUrl(item)" class="ui-menuitem-link" (click)="itemClick($event, item)">
+                        <a [href]="item.url||'#'" class="ui-menuitem-link" (click)="itemClick($event, item)">
                             <span class="ui-menuitem-text">{{item.label}}</span>
                         </a>
                     </li>
@@ -29,9 +29,13 @@ export class Breadcrumb implements OnDestroy {
 
     @Input() styleClass: string;
 
-    constructor(private router: Router, private location: Location) {}
+    constructor(private router: Router) {}
 
     itemClick(event, item: MenuItem) {
+        if(!item.url||item.routerLink) {
+            event.preventDefault();
+        }
+
         if(item.command) {
             if(!item.eventEmitter) {
                 item.eventEmitter = new EventEmitter();
@@ -41,23 +45,11 @@ export class Breadcrumb implements OnDestroy {
             item.eventEmitter.emit(event);
         }
 
-        if(!item.url) {
-            event.preventDefault();
-        }
-    }
-
-    getItemUrl(item: MenuItem): string {
-        if(item.url) {
-            if(Array.isArray(item.url))
-                return this.location.prepareExternalUrl(this.router.generate(item.url).toLinkUrl());
-            else
-                return item.url;
-        }
-        else {
-            return '#';
+        if(item.routerLink) {
+            this.router.navigate(item.routerLink);
         }
     }
-
+        
     ngOnDestroy() {
         if(this.model) {
             for(let item of this.model) {

diff --git a/components/contextmenu/contextmenu.ts b/components/contextmenu/contextmenu.ts
@@ -2,7 +2,7 @@ import {Component,ElementRef,AfterViewInit,OnDestroy,Input,Output,Renderer,Event
 import {DomHandler} from '../dom/domhandler';
 import {MenuItem} from '../api/menumodel';
 import {Location} from '@angular/common';
-import {Router} from '@angular/router-deprecated';
+import {Router} from '@angular/router';
 
 @Component({
     selector: 'p-contextMenuSub',
@@ -12,7 +12,7 @@ import {Router} from '@angular/router-deprecated';
             <template ngFor let-child [ngForOf]="(root ? item : item.items)">
                 <li #item [ngClass]="{'ui-menuitem ui-widget ui-corner-all':true,'ui-menu-parent':child.items,'ui-menuitem-active':item==activeItem}"
                     (mouseenter)="onItemMouseEnter($event, item)" (mouseleave)="onItemMouseLeave($event, item)">
-                    <a #link [href]="getItemUrl(child)" class="ui-menuitem-link ui-corner-all" [ngClass]="{'ui-state-hover':link==activeLink}" (click)="itemClick($event, child)">
+                    <a #link [href]="child.url||'#'" class="ui-menuitem-link ui-corner-all" [ngClass]="{'ui-state-hover':link==activeLink}" (click)="itemClick($event, child)">
                         <span class="ui-submenu-icon fa fa-fw fa-caret-right" *ngIf="child.items"></span>
                         <span class="ui-menuitem-icon fa fa-fw" *ngIf="child.icon" [ngClass]="child.icon"></span>
                         <span class="ui-menuitem-text">{{child.label}}</span>
@@ -31,7 +31,7 @@ export class ContextMenuSub {
 
     @Input() root: boolean;
 
-    constructor(private domHandler: DomHandler, private router: Router, private location: Location) {}
+    constructor(private domHandler: DomHandler, private router: Router) {}
 
     activeItem: any;
 
@@ -56,6 +56,10 @@ export class ContextMenuSub {
     }
 
     itemClick(event, item: MenuItem) {
+        if(!item.url||item.routerLink) {
+            event.preventDefault();
+        }
+
         if(item.command) {
             if(!item.eventEmitter) {
                 item.eventEmitter = new EventEmitter();
@@ -65,28 +69,15 @@ export class ContextMenuSub {
             item.eventEmitter.emit(event);
         }
 
-        if(!item.url) {
-            event.preventDefault();
+        if(item.routerLink) {
+            this.router.navigate(item.routerLink);
         }
     }
 
     listClick(event) {
         this.activeItem = null;
         this.activeLink = null;
     }
-
-    getItemUrl(item: MenuItem): string {
-        if(item.url) {
-            if(Array.isArray(item.url))
-                return this.location.prepareExternalUrl(this.router.generate(item.url).toLinkUrl());
-            else
-                return item.url;
-        }
-        else {
-            return '#';
-        }
-    }
-
 }
 
 @Component({

diff --git a/components/megamenu/megamenu.ts b/components/megamenu/megamenu.ts
@@ -2,7 +2,7 @@ import {Component,ElementRef,AfterViewInit,OnDestroy,Input,Output,Renderer,Event
 import {DomHandler} from '../dom/domhandler';
 import {MenuItem} from '../api/menumodel';
 import {Location} from '@angular/common';
-import {Router} from '@angular/router-deprecated';
+import {Router} from '@angular/router';
 
 @Component({
     selector: 'p-megaMenu',
@@ -27,7 +27,7 @@ import {Router} from '@angular/router-deprecated';
                                                 <ul class="ui-menu-list ui-helper-reset">
                                                     <li class="ui-widget-header ui-corner-all"><h3>{{submenu.label}}</h3></li>
                                                     <li *ngFor="let item of submenu.items" class="ui-menuitem ui-widget ui-corner-all">
-                                                        <a #link [href]="getItemUrl(item)" class="ui-menuitem-link ui-corner-all" [ngClass]="{'ui-state-hover':link==hoveredItem}"
+                                                        <a #link [href]="item.url||'#'" class="ui-menuitem-link ui-corner-all" [ngClass]="{'ui-state-hover':link==hoveredItem}"
                                                             (mouseenter)="hoveredItem=$event.target" (mouseleave)="hoveredItem=null" (click)="itemClick($event, item)">
                                                             <span class="ui-menuitem-icon fa fa-fw" *ngIf="item.icon" [ngClass]="item.icon"></span>
                                                             <span class="ui-menuitem-text">{{item.label}}</span>
@@ -61,7 +61,7 @@ export class MegaMenu implements OnDestroy {
 
     activeLink: any;
 
-    constructor(private el: ElementRef, private domHandler: DomHandler, private renderer: Renderer, private router: Router, private location: Location) {}
+    constructor(private el: ElementRef, private domHandler: DomHandler, private renderer: Renderer, private router: Router) {}
 
     onItemMouseEnter(event, item) {
         this.activeItem = item;
@@ -87,6 +87,10 @@ export class MegaMenu implements OnDestroy {
     }
 
     itemClick(event, item: MenuItem) {
+        if(!item.url||item.routerLink) {
+            event.preventDefault();
+        }
+
         if(item.command) {
             if(!item.eventEmitter) {
                 item.eventEmitter = new EventEmitter();
@@ -96,8 +100,8 @@ export class MegaMenu implements OnDestroy {
             item.eventEmitter.emit(event);
         }
 
-        if(!item.url) {
-            event.preventDefault();
+        if(item.routerLink) {
+            this.router.navigate(item.routerLink);
         }
 
         this.activeItem = null;
@@ -151,17 +155,4 @@ export class MegaMenu implements OnDestroy {
 
         return columnClass;
     }
-
-    getItemUrl(item: MenuItem): string {
-        if(item.url) {
-            if(Array.isArray(item.url))
-                return this.location.prepareExternalUrl(this.router.generate(item.url).toLinkUrl());
-            else
-                return item.url;
-        }
-        else {
-            return '#';
-        }
-    }
-
 }
diff --git a/components/menu/menu.ts b/components/menu/menu.ts
@@ -1,8 +1,7 @@
 import {Component,ElementRef,AfterViewInit,OnDestroy,Input,Output,Renderer,EventEmitter} from '@angular/core';
 import {DomHandler} from '../dom/domhandler';
 import {MenuItem} from '../api/menumodel';
-import {Location} from '@angular/common';
-import {Router} from '@angular/router-deprecated';
+import {Router} from '@angular/router';
 
 @Component({
     selector: 'p-menu',
@@ -13,7 +12,7 @@ import {Router} from '@angular/router-deprecated';
                 <template ngFor let-submenu [ngForOf]="model" *ngIf="hasSubMenu()">
                     <li class="ui-widget-header ui-corner-all"><h3>{{submenu.label}}</h3></li>
                     <li *ngFor="let item of submenu.items" class="ui-menuitem ui-widget ui-corner-all">
-                        <a #link [href]="getItemUrl(item)" class="ui-menuitem-link ui-corner-all" [ngClass]="{'ui-state-hover':link==hoveredItem}"
+                        <a #link [href]="item.url||'#'" class="ui-menuitem-link ui-corner-all" [ngClass]="{'ui-state-hover':link==hoveredItem}"
                             (mouseenter)="hoveredItem=$event.target" (mouseleave)="hoveredItem=null" (click)="itemClick($event, item)">
                             <span class="ui-menuitem-icon fa fa-fw" *ngIf="item.icon" [ngClass]="item.icon"></span>
                             <span class="ui-menuitem-text">{{item.label}}</span>
@@ -22,7 +21,7 @@ import {Router} from '@angular/router-deprecated';
                 </template>
                 <template ngFor let-item [ngForOf]="model" *ngIf="!hasSubMenu()">
                     <li class="ui-menuitem ui-widget ui-corner-all">
-                        <a #link [href]="getItemUrl(item)" class="ui-menuitem-link ui-corner-all" [ngClass]="{'ui-state-hover':link==hoveredItem}"
+                        <a #link [href]="item.url||'#'" class="ui-menuitem-link ui-corner-all" [ngClass]="{'ui-state-hover':link==hoveredItem}"
                             (mouseenter)="hoveredItem=$event.target" (mouseleave)="hoveredItem=null" (click)="itemClick($event, item)">
                             <span class="ui-menuitem-icon fa fa-fw" *ngIf="item.icon" [ngClass]="item.icon"></span>
                             <span class="ui-menuitem-text">{{item.label}}</span>
@@ -50,7 +49,7 @@ export class Menu implements AfterViewInit,OnDestroy {
 
     preventDocumentDefault: any;
 
-    constructor(private el: ElementRef, private domHandler: DomHandler, private renderer: Renderer, private router: Router, private location: Location) {}
+    constructor(private el: ElementRef, private domHandler: DomHandler, private renderer: Renderer, private router: Router) {}
 
     ngAfterViewInit() {
         this.container = this.el.nativeElement.children[0];
@@ -85,6 +84,10 @@ export class Menu implements AfterViewInit,OnDestroy {
     }
 
     itemClick(event, item: MenuItem) {
+        if(!item.url||item.routerLink) {
+            event.preventDefault();
+        }
+
         if(item.command) {
             if(!item.eventEmitter) {
                 item.eventEmitter = new EventEmitter();
@@ -98,8 +101,8 @@ export class Menu implements AfterViewInit,OnDestroy {
             this.hide();
         }
 
-        if(!item.url) {
-            event.preventDefault();
+        if(item.routerLink) {
+            this.router.navigate(item.routerLink);
         }
     }
 
@@ -137,17 +140,4 @@ export class Menu implements AfterViewInit,OnDestroy {
             }
         }
     }
-
-    getItemUrl(item: MenuItem): string {
-        if(item.url) {
-            if(Array.isArray(item.url))
-                return this.location.prepareExternalUrl(this.router.generate(item.url).toLinkUrl());
-            else
-                return item.url;
-        }
-        else {
-            return '#';
-        }
-    }
-
 }
diff --git a/components/menubar/menubar.ts b/components/menubar/menubar.ts
@@ -2,7 +2,7 @@ import {Component,ElementRef,AfterViewInit,OnDestroy,Input,Output,Renderer,Event
 import {DomHandler} from '../dom/domhandler';
 import {MenuItem} from '../api/menumodel';
 import {Location} from '@angular/common';
-import {Router} from '@angular/router-deprecated';
+import {Router} from '@angular/router';
 
 @Component({
     selector: 'p-menubarSub',
@@ -12,7 +12,7 @@ import {Router} from '@angular/router-deprecated';
             <template ngFor let-child [ngForOf]="(root ? item : item.items)">
                 <li #item [ngClass]="{'ui-menuitem ui-widget ui-corner-all':true,'ui-menu-parent':child.items,'ui-menuitem-active':item==activeItem}"
                     (mouseenter)="onItemMouseEnter($event, item)" (mouseleave)="onItemMouseLeave($event, item)">
-                    <a #link [href]="getItemUrl(child)" class="ui-menuitem-link ui-corner-all" [ngClass]="{'ui-state-hover':link==activeLink}" (click)="itemClick($event, child)">
+                    <a #link [href]="child.url||'#'" class="ui-menuitem-link ui-corner-all" [ngClass]="{'ui-state-hover':link==activeLink}" (click)="itemClick($event, child)">
                         <span class="ui-submenu-icon fa fa-fw" *ngIf="child.items" [ngClass]="{'fa-caret-down':root,'fa-caret-right':!root}"></span>
                         <span class="ui-menuitem-icon fa fa-fw" *ngIf="child.icon" [ngClass]="child.icon"></span>
                         <span class="ui-menuitem-text">{{child.label}}</span>
@@ -31,7 +31,7 @@ export class MenubarSub {
 
     @Input() root: boolean;
 
-    constructor(private domHandler: DomHandler, private router: Router, private location: Location) {}
+    constructor(private domHandler: DomHandler, private router: Router) {}
 
     activeItem: any;
 
@@ -62,6 +62,10 @@ export class MenubarSub {
     }
 
     itemClick(event, item: MenuItem) {
+        if(!item.url||item.routerLink) {
+            event.preventDefault();
+        }
+
         if(item.command) {
             if(!item.eventEmitter) {
                 item.eventEmitter = new EventEmitter();
@@ -70,27 +74,15 @@ export class MenubarSub {
 
             item.eventEmitter.emit(event);
         }
-                
-        if(!item.url) {
-            event.preventDefault();
+
+        if(item.routerLink) {
+            this.router.navigate(item.routerLink);
         }
 
         this.activeItem = null;
         this.activeLink = null;
     }
-
-    getItemUrl(item: MenuItem): string {
-        if(item.url) {
-            if(Array.isArray(item.url))
-                return this.location.prepareExternalUrl(this.router.generate(item.url).toLinkUrl());
-            else
-                return item.url;
-        }
-        else {
-            return '#';
-        }
-    }
-
+
     listClick(event) {
         this.activeItem = null;
         this.activeLink = null;