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

Make conflict_of synced property

Browse Source
This commit is contained in:
Mo Bitar
2019-02-10 17:34:20 -06:00
parent feb68907d0
commit 7a61b243ce
7 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,7 +255,7 @@ angular.module('app')
})
}
if(note.conflict_of) {
if(note.content.conflict_of) {
flags.push({
text: "Conflicted Copy",
class: "danger"
@@ -327,7 +327,11 @@ angular.module('app')
let run = () => {
$timeout(() => {
this.selectedNote = note;
note.conflict_of = null; // clear conflict
if(note.content.conflict_of) {
note.content.conflict_of = null; // clear conflict
note.setDirty(true, true);
syncManager.sync();
}
this.selectionMade()(note);
this.selectedIndex = Math.max(this.visibleNotes().indexOf(note), 0);

6
app/assets/javascripts/app/controllers/tags.js
View File

@@ -107,7 +107,11 @@ angular.module('app')
});
}
this.selectedTag = tag;
tag.conflict_of = null; // clear conflict
if(tag.content.conflict_of) {
tag.content.conflict_of = null; // clear conflict
tag.setDirty(true, true);
syncManager.sync();
}
this.selectionMade()(tag);
}

6
app/assets/javascripts/app/directives/views/editorMenu.js
View File

@@ -25,7 +25,11 @@ class EditorMenu {
$scope.selectComponent = function(component) {
if(component) {
component.conflict_of = null; // clear conflict if applicable
if(component.content.conflict_of) {
component.content.conflict_of = null; // clear conflict if applicable
component.setDirty(true, true);
syncManager.sync();
}
}
$timeout(() => {
$scope.callback()(component);

4
app/assets/templates/directives/editor-menu.html.haml
View File

@@ -9,8 +9,8 @@
"circle" => "selectedEditor === editor && 'success'",
"has-button" => "selectedEditor == editor || defaultEditor == editor", "button-text" => "defaultEditor == editor ? 'Undefault' : 'Set Default'",
"button-action" => "toggleDefaultForEditor(editor)", "button-class" => "defaultEditor == editor ? 'warning' : 'info'"}
.sk-menu-panel-column{"ng-if" => "component.conflict_of || shouldDisplayRunningLocallyLabel(editor)"}
%strong.danger.medium-text{"ng-if" => "editor.conflict_of"} Conflicted copy
.sk-menu-panel-column{"ng-if" => "component.content.conflict_of || shouldDisplayRunningLocallyLabel(editor)"}
%strong.danger.medium-text{"ng-if" => "editor.content.conflict_of"} Conflicted copy
.sk-sublabel{"ng-if" => "shouldDisplayRunningLocallyLabel(editor)"} Running Locally
%a.no-decoration{"ng-if" => "editors.length == 0", "href" => "https://standardnotes.org/extensions", "target" => "blank"}

2
app/assets/templates/tags.html.haml
View File

@@ -30,7 +30,7 @@
"ng-change" => "ctrl.tagTitleDidChange(tag)", "ng-blur" => "ctrl.saveTag($event, tag)", "spellcheck" => "false"}
.count {{tag.cachedNoteCount}}
.red.small-text.bold{"ng-show" => "tag.conflict_of"} Conflicted copy
.red.small-text.bold{"ng-show" => "tag.content.conflict_of"} Conflicted copy
.red.small-text.bold{"ng-show" => "tag.errorDecrypting"} Unable to Decrypt
.menu{"ng-show" => "ctrl.selectedTag == tag"}

6
package-lock.json generated
View File

@@ -4830,9 +4830,9 @@
"dev": true
},
"standard-file-js": {
"version": "0.3.46",
"resolved": "https://registry.npmjs.org/standard-file-js/-/standard-file-js-0.3.46.tgz",
"integrity": "sha512-fGym9hkkWr+Fi+FTsNWJXPXUNUkkVf3A/T2Jc1YqqLSK5/ze0Txo3Ij9pVIfWD7EQcTN6arI7vw1ErpoXWfMaw==",
"version": "0.3.47",
"resolved": "https://registry.npmjs.org/standard-file-js/-/standard-file-js-0.3.47.tgz",
"integrity": "sha512-csWmQXj5eTh0uHuuYYD4pP7tEeORtkdlWuZpVBYFCip4ch2Ug4uyKOCjHr3uOYTjLVaQKhkE/6xPpECWASmQMg==",
"dev": true
},
"statuses": {

2
package.json
View File

@@ -38,7 +38,7 @@
"serve-static": "^1.13.2",
"sn-models": "0.1.14",
"sn-stylekit": "2.0.13",
"standard-file-js": "0.3.46",
"standard-file-js": "0.3.47",
"grunt-shell": "^2.1.0"
}
}