Skip to content

Commit 6937c0f

Browse files
Improve inline filter (#1315)
* Fix UI bugs. * Improve inline filter.
1 parent 8a4cae1 commit 6937c0f

6 files changed

Lines changed: 15 additions & 6 deletions

File tree

backend/src/Squidex.Domain.Apps.Core.Model/Contents/SquidexRichText.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ public static class SquidexRichText
1414
public static class NodeTypes
1515
{
1616
public const string ContentLink = "contentLink";
17+
18+
public const string PlainHtml = "plainHtml";
1719
}
1820

1921
private class ExtendedOptions : RichTextOptions
@@ -40,6 +42,7 @@ private static bool IsExtension(string type)
4042
[
4143
..RichTextOptions.Default.NodeTypes,
4244
NodeTypes.ContentLink,
45+
NodeTypes.PlainHtml,
4346
],
4447
MarkTypes = RichTextOptions.Default.MarkTypes,
4548
};

frontend/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"mousetrap": "1.6.5",
5151
"ng2-charts": "^8.0.0",
5252
"ngx-doc-viewer": "15.0.1",
53-
"ngx-inline-filter": "^0.3.0",
53+
"ngx-inline-filter": "^0.4.4",
5454
"ngx-scrollbar": "^19.1.4",
5555
"ngx-ui-tour-core": "16.0.0",
5656
"oidc-client-ts": "^3.4.1",

frontend/src/app/shared/components/search/search-form.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,12 @@ export class SearchFormComponent {
9999
addComparison: localizer.getOrKey('search.addFilter'),
100100
addGroup: localizer.getOrKey('search.addGroup'),
101101
addSorting: localizer.getOrKey('search.addSorting'),
102+
apply: localizer.getOrKey('common.search'),
102103
and: 'AND',
103104
not: 'NOT',
104105
noResults: ' - ',
105106
or: 'OR',
107+
reset: localizer.getOrKey('common.reset'),
106108
save: localizer.getOrKey('common.save'),
107109
searchPlaceholder: localizer.getOrKey('common.search'),
108110
searchShortcut: 'CTRL + I',

frontend/src/app/shared/state/queries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export interface SavedQuery {
2424

2525
const OLDEST_FIRST: Query = {
2626
sort: [
27-
{ path: 'lastModified', order: 'descending' },
27+
{ path: 'lastModified', order: 'ascending' },
2828
],
2929
};
3030

frontend/src/app/theme/_common.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ hr {
6363
@include no-drag;
6464
}
6565

66+
.nf-input-dropdown-content {
67+
line-height: 1.5rem;
68+
}
69+
6670
//
6771
// Rich editor icon. Must be placed here, because element is not created by angular.
6872
//

0 commit comments

Comments
 (0)