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

Better dummy management, fixes #313

Browse Source
This commit is contained in:
Mo Bitar
2019-10-08 14:00:39 -05:00
parent f7d92df273
commit cea268a1e0
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/app/controllers/editor.js
View File

@@ -398,6 +398,11 @@ angular.module('app')
} }
this.deleteNote = async function(permanently) { this.deleteNote = async function(permanently) {
if(this.note.dummy) {
alert("This note is a placeholder and cannot be deleted. To remove from your list, simply navigate to a different note.");
return;
}
let run = () => { let run = () => {
$timeout(() => { $timeout(() => {
if(this.note.locked) { if(this.note.locked) {

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

@@ -380,6 +380,10 @@ angular.module('app')
} }
this.selectNote = async function(note, viaClick = false) { this.selectNote = async function(note, viaClick = false) {
if(this.selectedNote === note) {
return;
}
if(!note) { if(!note) {
this.selectionMade()(null); this.selectionMade()(null);
return; return;
@@ -388,7 +392,7 @@ angular.module('app')
let run = () => { let run = () => {
$timeout(() => { $timeout(() => {
let dummyNote; let dummyNote;
if(this.selectedNote && this.selectedNote != note && this.selectedNote.dummy) { if(this.selectedNote && this.selectedNote != note && this.selectedNote.dummy == true) {
// remove dummy // remove dummy
dummyNote = this.selectedNote; dummyNote = this.selectedNote;
} }
@@ -404,7 +408,7 @@ angular.module('app')
// There needs to be a long timeout after setting selection before removing the dummy // There needs to be a long timeout after setting selection before removing the dummy
// Otherwise, you'll click a note, remove this one, and strangely, the click event registers for a lower cell // Otherwise, you'll click a note, remove this one, and strangely, the click event registers for a lower cell
if(dummyNote) { if(dummyNote && dummyNote.dummy == true) {
$timeout(() => { $timeout(() => {
modelManager.removeItemLocally(dummyNote); modelManager.removeItemLocally(dummyNote);
_.pull(this.notes, dummyNote); _.pull(this.notes, dummyNote);
@@ -431,14 +435,17 @@ angular.module('app')
} }
this.createNewNote = function() { this.createNewNote = function() {
if(this.selectedNote && this.selectedNote.dummy) {
return;
}
// The "Note X" counter is based off this.notes.length, but sometimes, what you see in the list is only a subset. // The "Note X" counter is based off this.notes.length, but sometimes, what you see in the list is only a subset.
// We can use this.visibleNotes().length, but that only accounts for non-paginated results, so first 15 or so. // We can use this.visibleNotes().length, but that only accounts for non-paginated results, so first 15 or so.
var title = "Note" + (this.notes ? (" " + (this.notes.length + 1)) : ""); let title = "Note" + (this.notes ? (" " + (this.notes.length + 1)) : "");
let newNote = modelManager.createItem({content_type: "Note", content: {text: "", title: title}}); let newNote = modelManager.createItem({content_type: "Note", content: {text: "", title: title}});
newNote.client_updated_at = new Date();
newNote.dummy = true; newNote.dummy = true;
this.newNote = newNote; this.selectNote(newNote);
this.selectNote(this.newNote); this.addNew()(newNote);
this.addNew()(this.newNote);
} }
this.noteFilter = {text : ''}; this.noteFilter = {text : ''};