Skip to content

Commit a0e1879

Browse files
author
Dementyev Alexey
committed
Merge remote-tracking branch 'upstream/master'
2 parents 06487dc + 348d2e5 commit a0e1879

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/behaviors/localization/locales/de.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ const de:IPartialLocaleValues = {
4141
select: {
4242
noResultsMessage: "Keine Ergebnisse",
4343
single: {
44-
placeholder: "Wählen Sie eins"
44+
placeholder: "Eintrag auswählen..."
4545
},
4646
multi: {
47-
placeholder: "Wählen...",
48-
maxSelectedMessage: "Max #{max} Auswähle",
49-
selectedMessage: "#{count} selections"
47+
placeholder: "Einträge auswählen...",
48+
maxSelectedMessage: "Höchstens #{max} Einträge",
49+
selectedMessage: "#{count} Einträge ausgewählt"
5050
}
5151
}
5252
};

src/misc/util/services/positioning.service.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { ElementRef } from "@angular/core";
2-
import Popper from "popper.js";
2+
import Popper, { Modifiers, PopperOptions, Placement, Data } from "popper.js";
33

4-
type PopperModifiers = Popper.Modifiers & {
4+
type PopperModifiers = Modifiers & {
55
computeStyle?:{
66
gpuAcceleration:boolean;
77
};
88
};
99
type PopperInstance = Popper & {
10-
options:Popper.PopperOptions & {
10+
options:PopperOptions & {
1111
modifiers:PopperModifiers;
1212
};
1313
};
@@ -43,7 +43,7 @@ export interface IPositionBoundingBox {
4343
right:number;
4444
}
4545

46-
function placementToPopper(placement:PositioningPlacement):Popper.Placement {
46+
function placementToPopper(placement:PositioningPlacement):Placement {
4747
if (!placement || placement === PositioningPlacement.Auto) {
4848
return "auto";
4949
}
@@ -67,7 +67,7 @@ function placementToPopper(placement:PositioningPlacement):Popper.Placement {
6767
}
6868

6969
// Join with hyphen to create Popper compatible placement.
70-
return chosenPlacement.join("-") as Popper.Placement;
70+
return chosenPlacement.join("-") as Placement;
7171
}
7272

7373
function popperToPlacement(popper:string):PositioningPlacement {
@@ -112,7 +112,7 @@ export class PositioningService {
112112
public readonly subject:ElementRef;
113113

114114
private _popper:PopperInstance;
115-
private _popperState:Popper.Data;
115+
private _popperState:Data;
116116
private _placement:PositioningPlacement;
117117

118118
public get placement():PositioningPlacement {
@@ -133,7 +133,7 @@ export class PositioningService {
133133
return popperToPlacement(this._popperState.placement);
134134
}
135135

136-
public get state():Popper.Data {
136+
public get state():Data {
137137
return this._popperState;
138138
}
139139

src/modules/select/components/select-option.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class SuiSelectOption<T> extends SuiDropdownMenuItem {
3333
if (!this.usesTemplate) {
3434
this.renderedText = formatter(this.value);
3535
} else {
36-
this.renderedText = undefined;
36+
this.renderedText = "";
3737
}
3838
}
3939

tslint.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "@edcarroll/code-style/tslint",
2+
"extends": ["@edcarroll/code-style/tslint", "@edcarroll/code-style/tslint-angular"],
33
"rules": {
44
"component-selector": [
55
true,

0 commit comments

Comments
 (0)