Skip to content

Commit 20f26e4

Browse files
authored
Merge pull request #20 from karlhiramoto/karl-fixes
Build and compile fixes
2 parents 8cabf64 + c02ca9f commit 20f26e4

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

components/search/search.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export class SuiSearch implements AfterViewInit {
3939
this._dropdownService.itemSelectedClass = "active";
4040

4141
this._dropdownService.isOpenChange
42-
.subscribe(isOpen => {
42+
.subscribe( (isOpen: boolean) => {
4343
if (isOpen) {
4444
if (!this._dropdownService.selectedItem) {
4545
this._dropdownService.selectNextItem();

components/select/multi-select.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import {SuiSelectMultiLabel} from "./multi-select-label";
3535
styles: [`
3636
:host input.search {
3737
width: 12em !important;
38-
}
38+
}
3939
.selected-results {
4040
display: none;
4141
}
@@ -158,7 +158,7 @@ export class SuiMultiSelect implements AfterContentInit, AfterViewInit {
158158
this._searchService.searchDelay = 0;
159159

160160
this._dropdownService.isOpenChange
161-
.subscribe(isOpen => {
161+
.subscribe((isOpen: boolean) => {
162162
if (isOpen) {
163163
if (this.isSearchable && !this._dropdownService.selectedItem) {
164164
this._dropdownService.selectNextItem();
@@ -258,7 +258,7 @@ export class SuiMultiSelect implements AfterContentInit, AfterViewInit {
258258
if (this.options.length > 0) {
259259
this.selectedOptions = this.selectedOptions.map(so => {
260260
let compareValue = this._searchService.deepValue(so, this.keyField);
261-
return this.options.find(o => compareValue == o);
261+
return this.options.find( (o:any) => compareValue == o);
262262
});
263263
}
264264
}

components/select/select.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import {SuiSelectMultiLabel} from "./multi-select-label";
3636
styles: [`
3737
:host input.search {
3838
width: 12em !important;
39-
}
39+
}
4040
.selected-results {
4141
display: none;
4242
}
@@ -154,7 +154,7 @@ export class SuiSelect implements AfterContentInit, AfterViewInit {
154154
this._searchService.searchDelay = 0;
155155

156156
this._dropdownService.isOpenChange
157-
.subscribe(isOpen => {
157+
.subscribe( (isOpen: boolean) => {
158158
if (isOpen) {
159159
if (this.isSearchable && !this._dropdownService.selectedItem) {
160160
this._dropdownService.selectNextItem();
@@ -232,7 +232,8 @@ export class SuiSelect implements AfterContentInit, AfterViewInit {
232232
if (value !== null && value !== undefined) {
233233
this.selectedOption = value;
234234
if (this.options.length > 0) {
235-
this.selectedOption = this.options.find(o => value == this._searchService.deepValue(o, this.keyField));
235+
this.selectedOption = this.options.find(
236+
(o:any) => value == this._searchService.deepValue(o, this.keyField));
236237
}
237238
}
238239
this.renderSelectedItem();

components/transition/transition.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class SuiTransition {
4242

4343
private animationTimeout:any;
4444

45-
private _isVisible = null;
45+
private _isVisible:boolean = null;
4646

4747
public get isVisible() {
4848
return this._isVisible;
@@ -54,7 +54,7 @@ export class SuiTransition {
5454
this.isHidden = this.isVisible !== null && !this.isVisible && !this.isAnimating;
5555
}
5656

57-
private _isHidden;
57+
private _isHidden: boolean;
5858

5959
public get isHidden() {
6060
return this._isHidden;

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@types/prismjs": "^1.4.17",
5050
"@types/protractor": "^1.5.16",
5151
"@types/requirejs": "^2.1.26",
52-
"angular-cli": "1.0.0-beta.11-webpack.8",
52+
"angular-cli": "1.0.0-beta.15",
5353
"codelyzer": "0.0.26",
5454
"jasmine-core": "2.4.1",
5555
"jasmine-spec-reporter": "2.5.0",
@@ -61,6 +61,6 @@
6161
"protractor": "3.3.0",
6262
"ts-node": "1.2.1",
6363
"tslint": "3.13.0",
64-
"typescript": "^2.0.0"
64+
"typescript": "^2.0.3"
6565
}
6666
}

0 commit comments

Comments
 (0)