From c82d9fa550484f7d0c315128f142ae225f9988e6 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 1 Mar 2019 09:33:38 +0100 Subject: [PATCH 1/3] Interpolator fixed. --- src/Squidex/app/framework/utils/interpolator.spec.ts | 6 ++++++ src/Squidex/app/framework/utils/interpolator.ts | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Squidex/app/framework/utils/interpolator.spec.ts b/src/Squidex/app/framework/utils/interpolator.spec.ts index 58de0557c..6da899ee1 100644 --- a/src/Squidex/app/framework/utils/interpolator.spec.ts +++ b/src/Squidex/app/framework/utils/interpolator.spec.ts @@ -21,6 +21,12 @@ describe('interpolate', () => { expect(result).toEqual('hello world'); }); + it('should interpolate with multiple object values', () => { + const result = interpolate('hello ${string1}${string2}', { string1: 'world', string2: '!' }); + + expect(result).toEqual('hello world!'); + }); + it('should interpolate with array value', () => { const result = interpolate('hello ${1}', ['my', 'world']); diff --git a/src/Squidex/app/framework/utils/interpolator.ts b/src/Squidex/app/framework/utils/interpolator.ts index 6f3f88e00..5ad5de24e 100644 --- a/src/Squidex/app/framework/utils/interpolator.ts +++ b/src/Squidex/app/framework/utils/interpolator.ts @@ -8,7 +8,7 @@ import { DateTime } from './date-time'; import { Types } from './types'; -const regex = /\${[^}]+}/; +const regex = /\${[^}]+}/g; export function interpolate(pattern: string, value?: any, shortcut?: string, fallback = 'undefined'): string { const result = pattern.replace(regex, (match: string) => { From 0f944bf88d589511dc4a83e4b8337d2c3523429f Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 1 Mar 2019 09:41:15 +0100 Subject: [PATCH 2/3] Case insensitive tag suggestions. --- .../app/framework/angular/forms/tag-editor.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Squidex/app/framework/angular/forms/tag-editor.component.ts b/src/Squidex/app/framework/angular/forms/tag-editor.component.ts index 9f70a8fc3..db787842b 100644 --- a/src/Squidex/app/framework/angular/forms/tag-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/tag-editor.component.ts @@ -152,7 +152,7 @@ export class TagEditorComponent extends StatefulControlComponent i this.resetSize(); }), map(query => query), - map(query => query ? query.trim() : query), + map(query => query ? query.trim().toLowerCase() : query), tap(query => { if (!query) { this.resetAutocompletion(); @@ -161,7 +161,7 @@ export class TagEditorComponent extends StatefulControlComponent i distinctUntilChanged(), map(query => { if (Types.isArray(this.suggestions) && query && query.length > 0) { - return this.suggestions.filter(s => s.indexOf(query) >= 0 && this.snapshot.items.indexOf(s) < 0); + return this.suggestions.filter(s => s.toLowerCase().indexOf(query) >= 0 && this.snapshot.items.indexOf(s) < 0); } else { return []; } From cc256ac782efa37c5adadc938542bb0c6a536d20 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 1 Mar 2019 09:45:54 +0100 Subject: [PATCH 3/3] Title position for tooltip --- .../features/schemas/pages/schemas/schemas-page.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html index d3ee7d5b5..07341296a 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html @@ -9,7 +9,7 @@ -