Skip to content

Commit e77c928

Browse files
lexasqUdayAppamudaykvrbaaavalorkin
authored
v18.1.2 RC (#6690)
* fix(Typeahead) Typeahead highlight displays <strong> tag when empty spaces added at the end of query and does not escape html tags (#6434) Co-authored-by: udayk <uday.appam@wavemaker.com> Co-authored-by: Alexey Umanskiy <sharkakatsukie@gmail.com> * fix(typeahead): rolled back changes from UdayAppam and introduced another solution * update hr.ts (#6447) change date separation from slashes (/) to dots (.) Co-authored-by: Dmitriy Shekhovtsov <valorkin@gmail.com> Co-authored-by: Alexey Umanskiy <sharkakatsukie@gmail.com> * fix(chronos): fixed chronos test for updated croatian locale * fix(bs-dropdown): state provided issue * fix(daterange-picker): locale change fix --------- Co-authored-by: UdayAppam <appam.uday@gmail.com> Co-authored-by: udayk <uday.appam@wavemaker.com> Co-authored-by: vrbaaa <44699684+vrbaaa@users.noreply.github.com> Co-authored-by: Dmitriy Shekhovtsov <valorkin@gmail.com>
1 parent 5b0fc2e commit e77c928

File tree

7 files changed

+6
-10
lines changed

7 files changed

+6
-10
lines changed

apps/ngx-bootstrap-docs/src/app/app.module.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
22
import { NgModule } from '@angular/core';
33
import { RouterModule } from '@angular/router';
4-
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
54
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
65

76
import { environment } from '../environments/environment';
@@ -15,8 +14,8 @@ import { routes } from './app.routing';
1514
],
1615
bootstrap: [AppComponent], imports: [BrowserAnimationsModule,
1716
DocsModule,
18-
RouterModule.forRoot(routes, { useHash: environment.useHash }),
19-
BsDropdownModule], providers: [
17+
RouterModule.forRoot(routes, { useHash: environment.useHash })
18+
], providers: [
2019
{ provide: NgApiDoc, useValue: ngdoc },
2120
{ provide: DOCS_TOKENS, useValue: routes },
2221
{ provide: SIDEBAR_ROUTES, useValue: SidebarRoutesStructure },

src/chronos/i18n/hr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const hrLocale: LocaleData = {
1414
longDateFormat: {
1515
LT: 'HH:mm',
1616
LTS: 'HH:mm:ss',
17-
L: 'DD/MM/YYYY',
17+
L: 'DD.MM.YYYY.',
1818
LL: 'D MMMM YYYY',
1919
LLL: 'D MMMM YYYY HH:mm',
2020
LLLL: 'dddd, D MMMM YYYY HH:mm'

src/chronos/testing/locale/hr.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ describe('locale: hr', () => {
5656
['a A', 'pm PM'],
5757
['[the] DDDo [day of the year]', 'the 45. day of the year'],
5858
['LTS', '15:25:50'],
59-
['L', '14/02/2010'],
59+
['L', '14.02.2010.'],
6060
['LL', '14 Veljača 2010'],
6161
['LLL', '14 Veljača 2010 15:25'],
6262
['LLLL', 'Nedjelja, 14 Veljača 2010 15:25'],
63-
['l', '14/2/2010'],
63+
['l', '14.2.2010.'],
6464
['ll', '14 Velj 2010'],
6565
['lll', '14 Velj 2010 15:25'],
6666
['llll', 'Ned, 14 Velj 2010 15:25']

src/datepicker/bs-datepicker-input.directive.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ const BS_DATEPICKER_VALIDATOR: Provider = {
5151
@Directive({
5252
selector: `input[bsDatepicker]`,
5353
providers: [
54-
BsLocaleService,
5554
BS_DATEPICKER_VALUE_ACCESSOR,
5655
BS_DATEPICKER_VALIDATOR
5756
],

src/datepicker/bs-daterangepicker-input.directive.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ const BS_DATERANGEPICKER_VALIDATOR: Provider = {
5858
'(blur)': 'onBlur()'
5959
},
6060
providers: [
61-
BsLocaleService,
6261
BS_DATERANGEPICKER_VALUE_ACCESSOR,
6362
BS_DATERANGEPICKER_VALIDATOR
6463
],

src/dropdown/bs-dropdown-container.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import { NgClass } from '@angular/common';
3232
[class.open]="isOpen"><ng-content></ng-content>
3333
</div>
3434
`,
35-
providers: [BsDropdownState]
3635
})
3736
export class BsDropdownContainerComponent implements OnDestroy {
3837
isOpen = false;

src/typeahead/typeahead-container.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ export class TypeaheadContainerComponent implements OnDestroy {
276276
`${itemStr.substring(0, startIdx)}<strong>${itemStr.substring(startIdx, startIdx + tokenLen)}</strong>` +
277277
`${itemStr.substring(startIdx + tokenLen)}`;
278278
itemStrHelper =
279-
`${itemStrHelper.substring(0, startIdx)} ${' '.repeat(tokenLen)} ` +
279+
`${itemStrHelper.substring(0, startIdx)}????????${'??'.repeat(tokenLen)}??????????` +
280280
`${itemStrHelper.substring(startIdx + tokenLen)}`;
281281
}
282282
}

0 commit comments

Comments
 (0)