Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Update angular to 4.2.5 #850

Merged
merged 19 commits into from
Jun 30, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@
"watch": "npm run test:unit -- --auto-watch --no-single-run"
},
"peerDependencies": {
"@blackbaud/stache": "2.0.0-beta.7"
"@blackbaud/stache": "2.0.0-beta.8"
},
"dependencies": {
"@angular/animations": "4.1.3",
"@angular/common": "4.1.3",
"@angular/compiler": "4.1.3",
"@angular/core": "4.1.3",
"@angular/forms": "4.1.3",
"@angular/platform-browser": "4.1.3",
"@angular/platform-browser-dynamic": "4.1.3",
"@angular/router": "4.1.3",
"@angular/animations": "4.2.5",
"@angular/common": "4.2.5",
"@angular/compiler": "4.2.5",
"@angular/core": "4.2.5",
"@angular/forms": "4.2.5",
"@angular/platform-browser": "4.2.5",
"@angular/platform-browser-dynamic": "4.2.5",
"@angular/router": "4.2.5",
"core-js": "2.4.1",
"dragula": "3.7.2",
"font-awesome": "4.7.0",
Expand All @@ -61,8 +61,8 @@
"web-animations-js": "2.2.5"
},
"devDependencies": {
"@angular/compiler-cli": "4.1.3",
"@blackbaud/skyux-builder": "1.0.0-rc.3",
"@angular/compiler-cli": "4.2.5",
"@blackbaud/skyux-builder": "1.0.0-rc.4",
"@blackbaud/stache": "2.0.0-beta.7",
"@types/core-js": "0.9.41",
"@types/jasmine": "2.5.47",
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/demo-components.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ export class SkyDemoComponentsService {
fileContents: require('!!raw-loader!./timepicker/timepicker-demo.component.html')
},
{
name: 'tabs-demo.component.ts',
name: 'timepicker-demo.component.ts',
fileContents: require('!!raw-loader!./timepicker/timepicker-demo.component.ts'),
componentName: 'SkyTimePickerDemoComponent',
bootstrapSelector: 'sky-timepicker-demo'
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/shared/demo-page-plunker-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class SkyDemoPagePlunkerService {

'rxjs': 'npm:rxjs@5.1.0',
'typescript': 'npm:typescript@2.0.2/lib/typescript.js',
'@blackbaud/skyux/dist/core': 'npm:@blackbaud/skyux@2.0.0-beta.31/dist/bundles/core.umd.js',
'@blackbaud/skyux/dist/core': 'npm:@blackbaud/skyux/dist/bundles/core.umd.js',

'moment': 'npm:moment/moment.js',

Expand Down
1 change: 1 addition & 0 deletions src/app/components/timepicker/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@

<sky-demo-page-example>
<sky-timepicker-demo></sky-timepicker-demo>
<sky-demo-page-code demoName="Timepicker"></sky-demo-page-code>
</sky-demo-page-example>
</sky-demo-page>
9 changes: 7 additions & 2 deletions src/app/components/timepicker/timepicker-demo.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,13 @@ <h3>24-hour timepicker.</h3>
<h3>Custom timepicker.</h3>
<div style="max-width: 400px">
<sky-timepicker #timePickerExample3>
<input type="hidden" [skyTimepickerInput]="timePickerExample3" [timeFormat]="format24" [returnFormat]="returnFormat" (activeTime)="alert($event)"
[(ngModel)]="selectedTime3" #time3="ngModel" />
<input
type="hidden"
[skyTimepickerInput]="timePickerExample3"
[timeFormat]="format24"
[returnFormat]="returnFormat"
[(ngModel)]="selectedTime3"
#time3="ngModel" />
</sky-timepicker>
<div class="sky-error-label" *ngIf="time3.errors && time3.errors.skyTime && (time3.dirty || time3.touched)">
<div [hidden]="!time.errors.skyTime.invalid">
Expand Down
8 changes: 0 additions & 8 deletions src/app/components/timepicker/timepicker-demo.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { Component } from '@angular/core';

import { SkyWindowRefService } from '../../../modules/window';

@Component({
selector: 'sky-timepicker-demo',
templateUrl: './timepicker-demo.component.html'
Expand All @@ -14,10 +12,4 @@ export class SkyTimePickerDemoComponent {
public selectedTime2: any = '20:30';
public selectedTime3: any = '02:00:00-0400';

public constructor(
private windowObj: SkyWindowRefService) { }

public alert(event: any) {
this.windowObj.getWindow().alert(event);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<stache
pageTitle="Add an entry component"
showTableofContents="true">
<p>Entry components are components such as tiles and modals that are loaded imperatively by type. You must register entry components in the <stache-code>app-extras.modules.ts</stache-code> file. Entry components are not tied to routes. They are loaded dynamically and are not referenced in component templates. For more information about entry components, see the <a href="https://angular.io/docs/ts/latest/cookbook/ngmodule-faq.html#!#q-entry-component-defined">Angular documentation</a>.</p>
<p>Entry components are components such as tiles and modals that are loaded imperatively by type. You must register entry components in the <stache-code>app-extras.modules.ts</stache-code> file. Entry components are not tied to routes. They are loaded dynamically and are not referenced in component templates. For more information about entry components, see the <a href="https://angular.io/guide/ngmodule-faq#what-is-an-entry-component">Angular documentation</a>.</p>
<p>After you create a component in the default single-page application, you can create another page and add a SKY UX modal component to register an entry component.</p>

<ol>
Expand Down
2 changes: 2 additions & 0 deletions src/modules/text-highlight/text-highlight.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ export class SkyTextHighlightDirective implements OnChanges, AfterViewInit, OnDe
const matchedElements =
el.nativeElement.querySelectorAll(`mark.${className}`) as NodeList;

/* istanbul ignore else */
/* sanity check */
if (matchedElements) {
for (let i = 0; i < matchedElements.length; i++) {
const node = matchedElements[i];
Expand Down
1 change: 0 additions & 1 deletion src/modules/timepicker/timepicker.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ export class SkyTimepickerComponent implements OnInit {
/* istanbul ignore next */
return parseInt(moment(this.activeTime).format('h'), 0) || 1;
}

/* istanbul ignore else */
if (this.is8601) {
return moment(this.activeTime).hour() + 0;
Expand Down