Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-15 09:45:52 +01:00
Code Issues Packages Projects Releases Activity

use isLabelTruthy() for most binary labels

Browse Source
This commit is contained in:
zadam
2023-06-29 00:14:12 +02:00
parent 430f2975f8
commit a46c5a2243
14 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/share/routes.js
View File

@@ -27,7 +27,7 @@ function getSharedSubTreeRoot(note) {
}
function addNoIndexHeader(note, res) {
if (note.hasLabel('shareDisallowRobotIndexing')) {
if (note.isLabelTruthy('shareDisallowRobotIndexing')) {
res.setHeader('X-Robots-Tag', 'noindex');
}
}
@@ -113,7 +113,7 @@ function register(router) {
addNoIndexHeader(note, res);
if (note.hasLabel('shareRaw')) {
if (note.isLabelTruthy('shareRaw')) {
res.setHeader('Content-Type', note.mime)
.send(note.getContent());

16
src/share/shaca/entities/snote.js
View File

@@ -83,7 +83,7 @@ class SNote extends AbstractShacaEntity {
return this.getChildBranches()
.filter(branch => !branch.isHidden)
.map(branch => branch.getNote())
.filter(childNote => !childNote.hasLabel('shareHiddenFromTree'));
.filter(childNote => !childNote.isLabelTruthy('shareHiddenFromTree'));
}
/** @returns {boolean} */
@@ -238,6 +238,20 @@ class SNote extends AbstractShacaEntity {
*/
hasLabel(name) { return this.hasAttribute(LABEL, name); }
/**
* @param {string} name - label name
* @returns {boolean} true if label exists (including inherited) and does not have "false" value.
*/
isLabelTruthy(name) {
const label = this.getLabel(name);
if (!label) {
return false;
}
return label && label.value !== 'false';
}
/**
* @param {string} name - label name
* @returns {boolean} true if label exists (excluding inherited)