rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/auth

Browse Source
This commit is contained in:
Baptiste Grob
2021-03-08 11:20:48 +01:00
parent 8899c6075a e1a5dde968
commit 225db73773
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/views/notes/notes_view.ts
View File

@@ -328,7 +328,7 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesState> {
* an index is roughly O(n^2). * an index is roughly O(n^2).
*/ */
private reloadNotesDisplayOptions() { private reloadNotesDisplayOptions() {
const tag = this.appState.selectedTag!; const tag = this.appState.selectedTag;
const searchText = this.getState().noteFilter.text.toLowerCase(); const searchText = this.getState().noteFilter.text.toLowerCase();
const searchQuery = searchText ? { const searchQuery = searchText ? {
query: searchText, query: searchText,
@@ -337,7 +337,7 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesState> {
const criteria = NotesDisplayCriteria.Create({ const criteria = NotesDisplayCriteria.Create({
sortProperty: this.state.sortBy! as CollectionSort, sortProperty: this.state.sortBy! as CollectionSort,
sortDirection: this.state.sortReverse! ? 'asc' : 'dsc', sortDirection: this.state.sortReverse! ? 'asc' : 'dsc',
tags: [tag], tags: tag ? [tag] : [],
includeArchived: this.getState().showArchived!, includeArchived: this.getState().showArchived!,
includePinned: !this.getState().hidePinned!, includePinned: !this.getState().hidePinned!,
searchQuery: searchQuery searchQuery: searchQuery

8
app/assets/javascripts/views/tags/tags_view.ts
View File

@@ -246,12 +246,8 @@ class TagsViewCtrl extends PureViewCtrl<unknown, TagState> {
this.selectTag(tag as SNTag); this.selectTag(tag as SNTag);
} }
} else if (data.item!.content_type === ContentType.SmartTag) { } else if (data.item!.content_type === ContentType.SmartTag) {
this.application.createTemplateItem( const matchingTag = this.getState().smartTags.find(t => t.uuid === data.item!.uuid);
ContentType.SmartTag, this.selectTag(matchingTag as SNSmartTag);
data.item!.content as PayloadContent
).then(smartTag => {
this.selectTag(smartTag as SNSmartTag);
});
} }
} else if (action === ComponentAction.ClearSelection) { } else if (action === ComponentAction.ClearSelection) {
this.selectTag(this.getState().smartTags[0]); this.selectTag(this.getState().smartTags[0]);

8
app/assets/templates/directives/account-menu.pug
View File

@@ -149,7 +149,7 @@
.sk-panel-row .sk-panel-row
.sk-panel-column .sk-panel-column
.sk-h1.sk-bold.wrap {{self.state.user.email}} .sk-h1.sk-bold.wrap {{self.state.user.email}}
.sk-subtitle.subtle.normal {{self.state.server}} .sk-subtitle.neutral {{self.state.server}}
.sk-panel-row .sk-panel-row
a.sk-a.info.sk-panel-row.condensed( a.sk-a.info.sk-panel-row.condensed(
ng-click="self.openPasswordWizard()" ng-click="self.openPasswordWizard()"
@@ -303,11 +303,11 @@
.sk-panel-footer .sk-panel-footer
.sk-panel-row .sk-panel-row
.sk-p.left.neutral .sk-p.left.neutral
span.faded {{self.state.appVersion}} span {{self.state.appVersion}}
span(ng-if="self.state.showBetaWarning") span(ng-if="self.state.showBetaWarning")
span.faded ( span (
a.sk-a(ng-click="self.appState.disableBetaWarning()") Hide beta warning a.sk-a(ng-click="self.appState.disableBetaWarning()") Hide beta warning
span.faded ) span )
a.sk-a.right( a.sk-a.right(
ng-click='self.hidePasswordForm()', ng-click='self.hidePasswordForm()',
ng-if='self.state.formData.showLogin || self.state.formData.showRegister' ng-if='self.state.formData.showLogin || self.state.formData.showRegister'