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

Reset pagination after search complete

Browse Source
This commit is contained in:
Mo Bitar
2018-03-29 10:08:30 -05:00
parent 937d3f4947
commit d474f7e73d
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/app/controllers/notes.js
View File

@@ -98,13 +98,18 @@ angular.module('app')
let MinNoteHeight = 51.0; // This is the height of a note cell with nothing but the title, which *is* a display option let MinNoteHeight = 51.0; // This is the height of a note cell with nothing but the title, which *is* a display option
this.DefaultNotesToDisplayValue = (document.documentElement.clientHeight / MinNoteHeight) || 20; this.DefaultNotesToDisplayValue = (document.documentElement.clientHeight / MinNoteHeight) || 20;
this.notesToDisplay = this.DefaultNotesToDisplayValue;
this.paginate = function() { this.paginate = function() {
this.notesToDisplay += this.DefaultNotesToDisplayValue this.notesToDisplay += this.DefaultNotesToDisplayValue
} }
this.resetPagination = function() {
this.notesToDisplay = this.DefaultNotesToDisplayValue;
}
this.resetPagination();
this.panelTitle = function() { this.panelTitle = function() {
if(this.noteFilter.text.length) { if(this.isFiltering()) {
return `${this.tag.notes.filter((i) => {return i.visible;}).length} search results`; return `${this.tag.notes.filter((i) => {return i.visible;}).length} search results`;
} else if(this.tag) { } else if(this.tag) {
return `${this.tag.title} notes`; return `${this.tag.title} notes`;
@@ -145,7 +150,7 @@ angular.module('app')
scrollable.scrollLeft = 0; scrollable.scrollLeft = 0;
} }
this.notesToDisplay = this.DefaultNotesToDisplayValue; this.resetPagination();
this.showMenu = false; this.showMenu = false;
@@ -191,11 +196,15 @@ angular.module('app')
this.selectionMade()(note); this.selectionMade()(note);
this.selectedIndex = this.visibleNotes().indexOf(note); this.selectedIndex = this.visibleNotes().indexOf(note);
if(viaClick && this.noteFilter.text) { if(viaClick && this.isFiltering()) {
desktopManager.searchText(this.noteFilter.text); desktopManager.searchText(this.noteFilter.text);
} }
} }
this.isFiltering = function() {
return this.noteFilter.text && this.noteFilter.text.length > 0;
}
this.createNewNote = function() { this.createNewNote = function() {
var title = "New Note" + (this.tag.notes ? (" " + (this.tag.notes.length + 1)) : ""); var title = "New Note" + (this.tag.notes ? (" " + (this.tag.notes.length + 1)) : "");
this.newNote = modelManager.createItem({content_type: "Note", dummy: true, text: ""}); this.newNote = modelManager.createItem({content_type: "Note", dummy: true, text: ""});
@@ -239,6 +248,9 @@ angular.module('app')
this.noteFilter.text = ''; this.noteFilter.text = '';
this.onFilterEnter(); this.onFilterEnter();
this.filterTextChanged(); this.filterTextChanged();
// Reset loaded notes
this.resetPagination();
} }
this.filterTextChanged = function() { this.filterTextChanged = function() {