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

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"}