Merge remote-tracking branch 'origin/stable' into math2

This commit is contained in:
zadam
2020-10-19 23:04:12 +02:00
8 changed files with 30 additions and 11 deletions

View File

@@ -126,13 +126,6 @@ export default class NoteActionsWidget extends TabAwareWidget {
this.$showSourceButton.attr('disabled', 'disabled');
}
if (note.type === 'text') {
this.$exportNoteButton.removeAttr('disabled');
}
else {
this.$exportNoteButton.attr('disabled', 'disabled');
}
this.$protectButton.toggle(!note.isProtected);
this.$unprotectButton.toggle(!!note.isProtected);
}

View File

@@ -173,6 +173,9 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
}
else if (definition.labelType === 'boolean') {
$input.prop("type", "checkbox");
// hack, without this the checkbox is invisible
// we should be using a different bootstrap structure for checkboxes
$input.css('width', '80px');
if (valueAttr.value === "true") {
$input.prop("checked", "checked");

View File

@@ -122,6 +122,11 @@ export default class SimilarNotesWidget extends TabAwareWidget {
const similarNotes = await server.get('similar-notes/' + this.noteId);
if (!similarNotes) {
this.toggleInt(false);
return;
}
this.toggleInt(similarNotes.length > 0);
if (similarNotes.length === 0) {