Skip to content

Commit

Permalink
feat(package): upgrade ng2-bootstrap to rc.1 (#481)
Browse files Browse the repository at this point in the history
* Use dynamic versions of platform-browser bundle

* Add missing quote

* Upgrade to angular 2.0.0-rc.1

fixes #482, closes #472, fixes #477
  • Loading branch information
ciriarte authored and valorkin committed May 6, 2016
1 parent 2e2d79b commit 554be3d
Show file tree
Hide file tree
Showing 79 changed files with 187 additions and 178 deletions.
4 changes: 2 additions & 2 deletions components/accordion/accordion-group.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
Component, OnInit, OnDestroy, Input, HostBinding, Inject
} from 'angular2/core';
import {NgClass} from 'angular2/common';
} from '@angular/core';
import {NgClass} from '@angular/common';
import {CollapseDirective} from '../collapse';
import {AccordionComponent} from './accordion.component';

Expand Down
2 changes: 1 addition & 1 deletion components/accordion/accordion.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, Input, HostBinding} from 'angular2/core';
import {Component, Input, HostBinding} from '@angular/core';
import {AccordionPanelComponent} from './accordion-group.component';

// todo: support template url
Expand Down
7 changes: 4 additions & 3 deletions components/alert/alert.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import {it, beforeEach, injectAsync, TestComponentBuilder, ComponentFixture} from 'angular2/testing';
import {it, beforeEach, injectAsync } from '@angular/core/testing';
import { TestComponentBuilder, ComponentFixture } from '@angular/compiler/testing';
import {AlertComponent} from './alert.component';

describe('Component: Alert', () => {
let fixture:ComponentFixture, context:any;
let fixture:ComponentFixture<any>, context:any;
const overTemplate = `
<div class="alert" role="alert" [ngClass]="classes" *ngIf="!closed">
<button *ngIf="dismissible" type="button" class="close" (click)="onClose()" (touch)="onClose()">
Expand All @@ -16,7 +17,7 @@ describe('Component: Alert', () => {
return tcb
.overrideTemplate(AlertComponent, overTemplate)
.createAsync(AlertComponent)
.then((f:ComponentFixture) => {
.then((f:ComponentFixture<any>) => {
fixture = f;
context = fixture.debugElement.componentInstance;
});
Expand Down
4 changes: 2 additions & 2 deletions components/alert/alert.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, OnInit, Input, Output, EventEmitter} from 'angular2/core';
import {NgIf, NgClass} from 'angular2/common';
import {Component, OnInit, Input, Output, EventEmitter} from '@angular/core';
import {NgIf, NgClass} from '@angular/common';

const ALERT_TEMPLATE = `
<div class="alert" role="alert" [ngClass]="classes" *ngIf="!closed">
Expand Down
4 changes: 2 additions & 2 deletions components/buttons/button-checkbox.directive.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
Directive, OnInit, Input, HostBinding, HostListener, Self
} from 'angular2/core';
import {ControlValueAccessor, NgModel} from 'angular2/common';
} from '@angular/core';
import {ControlValueAccessor, NgModel} from '@angular/common';

@Directive({selector: '[btnCheckbox][ngModel]'})
export class ButtonCheckboxDirective implements ControlValueAccessor, OnInit {
Expand Down
4 changes: 2 additions & 2 deletions components/buttons/button-radio.directive.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
Directive, OnInit, Input, HostBinding, HostListener, Self, ElementRef
} from 'angular2/core';
import {ControlValueAccessor, NgModel} from 'angular2/common';
} from '@angular/core';
import {ControlValueAccessor, NgModel} from '@angular/common';

@Directive({selector: '[btnRadio][ngModel]'})
export class ButtonRadioDirective implements ControlValueAccessor, OnInit {
Expand Down
6 changes: 3 additions & 3 deletions components/carousel/carousel.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// todo: add animate

import {Component, OnDestroy, Input} from 'angular2/core';
import {NgFor} from 'angular2/common';
import {Component, OnDestroy, Input} from '@angular/core';
import {NgFor} from '@angular/common';
import {Ng2BootstrapConfig, Ng2BootstrapTheme} from '../ng2-bootstrap-config';
import {SlideComponent} from './slide.component';

Expand Down Expand Up @@ -36,7 +36,7 @@ const NAVIGATION:any = {
template: `
<div (mouseenter)="pause()" (mouseleave)="play()" class="carousel slide">
<ol class="carousel-indicators" *ngIf="slides.length > 1">
<li *ngFor="#slidez of slides" [class.active]="slidez.active === true" (click)="select(slidez)"></li>
<li *ngFor="let slidez of slides" [class.active]="slidez.active === true" (click)="select(slidez)"></li>
</ol>
<div class="carousel-inner"><ng-content></ng-content></div>
${NAVIGATION[Ng2BootstrapConfig.theme]}
Expand Down
2 changes: 1 addition & 1 deletion components/carousel/slide.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, OnInit, OnDestroy, Input, HostBinding} from 'angular2/core';
import {Component, OnInit, OnDestroy, Input, HostBinding} from '@angular/core';
import {CarouselComponent, Direction} from './carousel.component';

@Component({
Expand Down
6 changes: 3 additions & 3 deletions components/collapse/collapse.directive.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Directive, OnInit, ElementRef, Input, HostBinding, Renderer} from 'angular2/core';
import {AnimationBuilder} from 'angular2/src/animate/animation_builder';
// fix: replace with // 'angular2/animate';
import {Directive, OnInit, ElementRef, Input, HostBinding, Renderer} from '@angular/core';
import {AnimationBuilder} from '@angular/platform-browser/src/animate/animation_builder';
// fix: replace with // '@angular/animate';
// when https://github.com/angular/angular/issues/5984 will be fixed

// TODO: remove ElementRef
Expand Down
8 changes: 4 additions & 4 deletions components/common.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Directive, TemplateRef, ViewContainerRef, Inject} from 'angular2/core';
import {Directive, TemplateRef, ViewContainerRef, Inject} from '@angular/core';

export interface KeyAttribute {
[key:string]:any;
Expand All @@ -11,16 +11,16 @@ export interface KeyAttribute {
export class NgTranscludeDirective {
public viewRef:ViewContainerRef;

private _ngTransclude:TemplateRef;
private _ngTransclude:TemplateRef<any>;

private set ngTransclude(templateRef:TemplateRef) {
private set ngTransclude(templateRef:TemplateRef<any>) {
this._ngTransclude = templateRef;
if (templateRef) {
this.viewRef.createEmbeddedView(templateRef);
}
}

private get ngTransclude():TemplateRef {
private get ngTransclude():TemplateRef<any> {
return this._ngTransclude;
}

Expand Down
4 changes: 2 additions & 2 deletions components/datepicker/datepicker-inner.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Component, OnInit, EventEmitter, Input} from 'angular2/core';
import {Component, OnInit, EventEmitter, Input} from '@angular/core';
import {
CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgModel
} from 'angular2/common';
} from '@angular/common';
import {DateFormatter} from './date-formatter';

const FORMAT_DAY = 'DD';
Expand Down
10 changes: 5 additions & 5 deletions components/datepicker/datepicker-popup.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {
Component, Directive, EventEmitter, ComponentRef, ViewEncapsulation,
ElementRef, DynamicComponentLoader, Self, Renderer, ReflectiveInjector, provide, ViewContainerRef
} from 'angular2/core';
} from '@angular/core';
import {
CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgModel, NgStyle
} from 'angular2/common';
} from '@angular/common';
import {KeyAttribute} from '../common';
import {positionService} from '../position';
import {DatePickerComponent} from './datepicker.component';
Expand Down Expand Up @@ -127,7 +127,7 @@ export class DatePickerPopupDirective {
private _activeDate:Date;
private _isOpen:boolean = false;
private placement:string = 'bottom';
private popup:Promise<ComponentRef>;
private popup:Promise<ComponentRef<any>>;

public constructor(@Self() cd:NgModel, viewContainerRef:ViewContainerRef,
renderer:Renderer, loader:DynamicComponentLoader) {
Expand Down Expand Up @@ -166,7 +166,7 @@ export class DatePickerPopupDirective {

public hide(cb:Function):void {
if (this.popup) {
this.popup.then((componentRef:ComponentRef) => {
this.popup.then((componentRef:ComponentRef<any>) => {
componentRef.destroy();
cb();
return componentRef;
Expand All @@ -187,7 +187,7 @@ export class DatePickerPopupDirective {

this.popup = this.loader
.loadNextToLocation(PopupContainerComponent, this.viewContainerRef, binding)
.then((componentRef:ComponentRef) => {
.then((componentRef:ComponentRef<any>) => {
componentRef.instance.position(this.viewContainerRef);
componentRef.instance.popupComp = this;
/*componentRef.instance.update1.observer({
Expand Down
4 changes: 2 additions & 2 deletions components/datepicker/datepicker.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, Self, Input} from 'angular2/core';
import {CORE_DIRECTIVES, FORM_DIRECTIVES, ControlValueAccessor, NgModel} from 'angular2/common';
import {Component, Self, Input} from '@angular/core';
import {CORE_DIRECTIVES, FORM_DIRECTIVES, ControlValueAccessor, NgModel} from '@angular/common';
import {DatePickerInnerComponent} from './datepicker-inner.component';
import {DayPickerComponent} from './daypicker.component';
import {MonthPickerComponent} from './monthpicker.component';
Expand Down
14 changes: 7 additions & 7 deletions components/datepicker/daypicker.component.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import {Component, OnInit} from 'angular2/core';
import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
import {Component, OnInit} from '@angular/core';
import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from '@angular/common';
import {Ng2BootstrapConfig, Ng2BootstrapTheme} from '../ng2-bootstrap-config';
import {DatePickerInnerComponent} from './datepicker-inner.component';

// write an interface for template options
const TEMPLATE_OPTIONS:any = {
[Ng2BootstrapTheme.BS4]: {
DAY_TITLE: `
<th *ngFor="#labelz of labels" class="text-xs-center"><small aria-label="labelz.full"><b>{{labelz.abbr}}</b></small></th>
<th *ngFor="let labelz of labels" class="text-xs-center"><small aria-label="labelz.full"><b>{{labelz.abbr}}</b></small></th>
`,
WEEK_ROW: `
<td *ngIf="datePicker.showWeeks" class="text-xs-center h6"><em>{{ weekNumbers[index] }}</em></td>
<td *ngFor="#dtz of rowz" class="text-xs-center" role="gridcell" [id]="dtz.uid">
<td *ngFor="let dtz of rowz" class="text-xs-center" role="gridcell" [id]="dtz.uid">
<button type="button" style="min-width:100%;" class="btn btn-sm {{dtz.customClass}}"
*ngIf="!(datePicker.onlyCurrentMonth && dtz.secondary)"
[ngClass]="{'btn-secondary': !dtz.selected && !datePicker.isActive(dtz), 'btn-info': dtz.selected, disabled: dtz.disabled}"
Expand All @@ -26,11 +26,11 @@ const TEMPLATE_OPTIONS:any = {
},
[Ng2BootstrapTheme.BS3]: {
DAY_TITLE: `
<th *ngFor="#labelz of labels" class="text-center"><small aria-label="labelz.full"><b>{{labelz.abbr}}</b></small></th>
<th *ngFor="let labelz of labels" class="text-center"><small aria-label="labelz.full"><b>{{labelz.abbr}}</b></small></th>
`,
WEEK_ROW: `
<td *ngIf="datePicker.showWeeks" class="text-center h6"><em>{{ weekNumbers[index] }}</em></td>
<td *ngFor="#dtz of rowz" class="text-center" role="gridcell" [id]="dtz.uid">
<td *ngFor="let dtz of rowz" class="text-center" role="gridcell" [id]="dtz.uid">
<button type="button" style="min-width:100%;" class="btn btn-default btn-sm {{dtz.customClass}}"
*ngIf="!(datePicker.onlyCurrentMonth && dtz.secondary)"
[ngClass]="{'btn-info': dtz.selected, active: datePicker.isActive(dtz), disabled: dtz.disabled}"
Expand Down Expand Up @@ -83,7 +83,7 @@ const CURRENT_THEME_TEMPLATE:any = TEMPLATE_OPTIONS[Ng2BootstrapConfig.theme ||
</tr>
</thead>
<tbody>
<template ngFor [ngForOf]="rows" #rowz="$implicit" #index="index">
<template ngFor [ngForOf]="rows" let-rowz="$implicit" let-index="index">
<tr *ngIf="!(datePicker.onlyCurrentMonth && rowz[0].secondary && rowz[6].secondary)">
${CURRENT_THEME_TEMPLATE.WEEK_ROW}
</tr>
Expand Down
8 changes: 4 additions & 4 deletions components/datepicker/monthpicker.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, OnInit} from 'angular2/core';
import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
import {Component, OnInit} from '@angular/core';
import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from '@angular/common';
import {DatePickerInnerComponent} from './datepicker-inner.component';
import {Ng2BootstrapConfig} from '../ng2-bootstrap-config';

Expand Down Expand Up @@ -54,8 +54,8 @@ const CURRENT_THEME_TEMPLATE:any = TEMPLATE_OPTIONS[Ng2BootstrapConfig.theme] ||
</tr>
</thead>
<tbody>
<tr *ngFor="#rowz of rows">
<td *ngFor="#dtz of rowz" class="text-center" role="gridcell" id="{{dtz.uid}}" [ngClass]="dtz.customClass">
<tr *ngFor="let rowz of rows">
<td *ngFor="let dtz of rowz" class="text-center" role="gridcell" id="{{dtz.uid}}" [ngClass]="dtz.customClass">
${CURRENT_THEME_TEMPLATE.MONTH_BUTTON}
</td>
</tr>
Expand Down
8 changes: 4 additions & 4 deletions components/datepicker/yearpicker.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, OnInit} from 'angular2/core';
import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
import {Component, OnInit} from '@angular/core';
import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from '@angular/common';
import {Ng2BootstrapConfig} from '../ng2-bootstrap-config';
import {DatePickerInnerComponent} from './datepicker-inner.component';

Expand Down Expand Up @@ -59,8 +59,8 @@ const CURRENT_THEME_TEMPLATE:any = TEMPLATE_OPTIONS[Ng2BootstrapConfig.theme] ||
</tr>
</thead>
<tbody>
<tr *ngFor="#rowz of rows">
<td *ngFor="#dtz of rowz" class="text-center" role="gridcell">
<tr *ngFor="let rowz of rows">
<td *ngFor="let dtz of rowz" class="text-center" role="gridcell">
${CURRENT_THEME_TEMPLATE.YEAR_BUTTON}
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion components/dropdown/dropdown-keyboard-nav.directive.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Directive, ElementRef, HostListener} from 'angular2/core';
import {Directive, ElementRef, HostListener} from '@angular/core';
import {DropdownDirective} from './dropdown.directive';

@Directive({
Expand Down
2 changes: 1 addition & 1 deletion components/dropdown/dropdown-menu.directive.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Directive, ElementRef, Host, OnInit} from 'angular2/core';
import {Directive, ElementRef, Host, OnInit} from '@angular/core';
import {DropdownDirective} from './dropdown.directive';

@Directive({selector: '[dropdownMenu]'})
Expand Down
4 changes: 2 additions & 2 deletions components/dropdown/dropdown-toggle.directive.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {
Directive, ElementRef, Host, OnInit, Input, HostBinding, HostListener
} from 'angular2/core';
} from '@angular/core';
import {DropdownDirective} from './dropdown.directive';

import {global} from 'angular2/src/facade/lang';
import {global} from '@angular/core/src/facade/lang';
/* tslint:disable */
const MouseEvent = (global as any).MouseEvent as MouseEvent;
/* tslint:enable */
Expand Down
2 changes: 1 addition & 1 deletion components/dropdown/dropdown.directive.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
Directive, OnInit, OnDestroy, Input, Output, HostBinding, EventEmitter,
ElementRef
} from 'angular2/core';
} from '@angular/core';
import {dropdownService, NONINPUT} from './dropdown.service';

@Directive({selector: '[dropdown]'})
Expand Down
2 changes: 1 addition & 1 deletion components/dropdown/dropdown.interfaces.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {ElementRef} from 'angular2/core';
import {ElementRef} from '@angular/core';

export interface DropdownMenuInterface {
el: ElementRef;
Expand Down
2 changes: 1 addition & 1 deletion components/ng2-bootstrap-config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {global} from 'angular2/src/facade/lang';
import {global} from '@angular/core/src/facade/lang';

export enum Ng2BootstrapTheme {BS3 = 1, BS4 = 2}

Expand Down
4 changes: 2 additions & 2 deletions components/pagination/pager.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, OnInit, ElementRef, Renderer, Self} from 'angular2/core';
import {NgModel, NgClass} from 'angular2/common';
import {Component, OnInit, ElementRef, Renderer, Self} from '@angular/core';
import {NgModel, NgClass} from '@angular/common';
import {PaginationComponent} from './pagination.component';

const pagerConfig = {
Expand Down
6 changes: 3 additions & 3 deletions components/pagination/pagination.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
Component, OnInit, Input, Output, ElementRef, EventEmitter, Self, Renderer
} from 'angular2/core';
import {NgFor, NgIf, ControlValueAccessor, NgModel} from 'angular2/common';
} from '@angular/core';
import {NgFor, NgIf, ControlValueAccessor, NgModel} from '@angular/common';
import {KeyAttribute} from '../common';

// todo: extract base functionality classes
Expand Down Expand Up @@ -51,7 +51,7 @@ const PAGINATION_TEMPLATE = `
<a class="page-link" href (click)="selectPage(page - 1, $event)" [innerHTML]="getText('previous')"></a>
</li>
<li *ngFor="#pg of pages"
<li *ngFor="let pg of pages"
[class.active]="pg.active"
[class.disabled]="disabled&&!pg.active"
class="pagination-page page-item">
Expand Down
4 changes: 2 additions & 2 deletions components/progressbar/bar.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, OnInit, OnDestroy, Input, Host} from 'angular2/core';
import {NgClass, NgStyle} from 'angular2/common';
import {Component, OnInit, OnDestroy, Input, Host} from '@angular/core';
import {NgClass, NgStyle} from '@angular/common';
import {ProgressDirective} from './progress.directive';

// todo: number pipe
Expand Down
2 changes: 1 addition & 1 deletion components/progressbar/progress.directive.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Directive, OnInit, Input, HostBinding} from 'angular2/core';
import {Directive, OnInit, Input, HostBinding} from '@angular/core';
import {BarComponent} from './bar.component';

const progressConfig = {
Expand Down
2 changes: 1 addition & 1 deletion components/progressbar/progressbar.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, Input} from 'angular2/core';
import {Component, Input} from '@angular/core';
import {ProgressDirective} from './progress.directive';
import {BarComponent} from './bar.component';

Expand Down
8 changes: 4 additions & 4 deletions components/rating/rating.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {
Component, OnInit, Input, Output, HostListener, Self, EventEmitter
} from 'angular2/core';
import {NgFor, ControlValueAccessor, NgModel} from 'angular2/common';
} from '@angular/core';
import {NgFor, ControlValueAccessor, NgModel} from '@angular/common';

import {global} from 'angular2/src/facade/lang';
import {global} from '@angular/core/src/facade/lang';
/* tslint:disable */
const KeyboardEvent = (global as any).KeyboardEvent as KeyboardEvent;
/* tslint:enable */
Expand All @@ -15,7 +15,7 @@ const KeyboardEvent = (global as any).KeyboardEvent as KeyboardEvent;
directives: [NgFor],
template: `
<span (mouseleave)="reset()" (keydown)="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" [attr.aria-valuemax]="range.length" [attr.aria-valuenow]="value">
<template ngFor #r [ngForOf]="range" #index="index">
<template ngFor let-r [ngForOf]="range" let-index="index">
<span class="sr-only">({{ index < value ? '*' : ' ' }})</span>
<i (mouseenter)="enter(index + 1)" (click)="rate(index + 1)" class="glyphicon" [ngClass]="index < value ? r.stateOn : r.stateOff" [title]="r.title" ></i>
</template>
Expand Down
6 changes: 3 additions & 3 deletions components/tabs/tab-heading.directive.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {Directive, TemplateRef} from 'angular2/core';
import {Directive, TemplateRef} from '@angular/core';
import {TabDirective} from './tab.directive';

@Directive({selector: '[tabHeading]'})
export class TabHeadingDirective {
public templateRef:TemplateRef;
public constructor(templateRef:TemplateRef, tab:TabDirective) {
public templateRef:TemplateRef<any>;
public constructor(templateRef:TemplateRef<any>, tab:TabDirective) {
tab.headingRef = templateRef;
}
}
Loading

0 comments on commit 554be3d

Please sign in to comment.