no new note on launch

This commit is contained in:
Mo Bitar
2017-02-27 20:19:57 -06:00
parent 1f90bf0286
commit ba68e287ce
6 changed files with 26 additions and 16 deletions

View File

@@ -18,8 +18,6 @@ angular.module('app.frontend')
scope.$watch('ctrl.note', function(note, oldNote){
if(note) {
ctrl.setNote(note, oldNote);
} else {
ctrl.note = {};
}
});
}
@@ -28,7 +26,6 @@ angular.module('app.frontend')
.controller('EditorCtrl', function ($sce, $timeout, authManager, $rootScope, extensionManager, syncManager, modelManager) {
window.addEventListener("message", function(event){
// console.log("App received message:", event);
if(event.data.status) {
this.postNoteToExternalEditor();
} else {
@@ -92,7 +89,6 @@ angular.module('app.frontend')
this.editorForNote = function(note) {
var editors = modelManager.itemsForContentType("SN|Editor");
for(var editor of editors) {
// console.log(editor.notes, editor.references);
if(_.includes(editor.notes, note)) {
return editor;
}

View File

@@ -25,6 +25,7 @@ angular.module('app.frontend')
}
syncManager.loadLocalItems(function(items) {
$scope.allTag.didLoad = true;
$scope.$apply();
syncManager.sync(null);
@@ -35,10 +36,11 @@ angular.module('app.frontend')
});
var allTag = new Tag({all: true});
allTag.title = "All";
$scope.tags = modelManager.tags;
allTag.notes = modelManager.notes;
allTag.needsLoad = true;
$scope.allTag = allTag;
$scope.allTag.title = "All";
$scope.tags = modelManager.tags;
$scope.allTag.notes = modelManager.notes;
/*
Editor Callbacks

View File

@@ -18,7 +18,16 @@ angular.module('app.frontend')
link:function(scope, elem, attrs, ctrl) {
scope.$watch('ctrl.tag', function(tag, oldTag){
if(tag) {
ctrl.tagDidChange(tag, oldTag);
if(tag.needsLoad) {
scope.$watch('ctrl.tag.didLoad', function(didLoad){
if(didLoad) {
tag.needsLoad = false;
ctrl.tagDidChange(tag, oldTag);
}
});
} else {
ctrl.tagDidChange(tag, oldTag);
}
}
});
}
@@ -45,12 +54,15 @@ angular.module('app.frontend')
}
this.noteFilter.text = "";
this.setNotes(tag.notes);
}
tag.notes.forEach(function(note){
this.setNotes = function(notes) {
notes.forEach(function(note){
note.visible = true;
})
var createNew = tag.notes.length == 0;
var createNew = notes.length == 0;
this.selectFirstNote(createNew);
}