From 9765892d1856fdcf7d53852236dc8795c3c00d49 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 7 Oct 2023 21:49:25 +0300 Subject: [PATCH 01/15] fix loading canvas notes created in 0.61.7-beta, closes #4313 --- src/public/app/widgets/type_widgets/canvas.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/app/widgets/type_widgets/canvas.js b/src/public/app/widgets/type_widgets/canvas.js index 8ecf166103..43d836be04 100644 --- a/src/public/app/widgets/type_widgets/canvas.js +++ b/src/public/app/widgets/type_widgets/canvas.js @@ -209,7 +209,7 @@ export default class ExcalidrawTypeWidget extends TypeWidget { }; } - const {elements, files, appState} = content; + const {elements, files, appState = {}} = content; appState.theme = this.themeStyle; From 3d15aeae58224ac8716dd58938458e89af9bf7a0 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 7 Oct 2023 23:02:33 +0300 Subject: [PATCH 02/15] def value --- src/services/cloning.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/cloning.js b/src/services/cloning.js index ed1c242141..4d66033732 100644 --- a/src/services/cloning.js +++ b/src/services/cloning.js @@ -7,7 +7,7 @@ const BBranch = require('../becca/entities/bbranch'); const becca = require("../becca/becca"); const log = require("./log"); -function cloneNoteToParentNote(noteId, parentNoteId, prefix) { +function cloneNoteToParentNote(noteId, parentNoteId, prefix = null) { if (!(noteId in becca.notes) || !(parentNoteId in becca.notes)) { return { success: false, message: 'Note cannot be cloned because either the cloned note or the intended parent is deleted.' }; } From d09d3f5a9667268d9fa2fa0cfab7b734e5fd242b Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 7 Oct 2023 23:02:47 +0300 Subject: [PATCH 03/15] release 0.61.9-beta --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 053aa2015b..d91151dcb9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.61.8-beta", + "version": "0.61.9-beta", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index 6451155536..c461b9c7cf 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2023-09-29T00:54:45+02:00", buildRevision: "e5555beea9a1638fefa218118e0596f4cfc1f4d0" }; +module.exports = { buildDate:"2023-10-07T23:02:47+03:00", buildRevision: "3d15aeae58224ac8716dd58938458e89af9bf7a0" }; From 5dd4586ebe9c62f1058ce0b50e5ba246a84f62c3 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 14 Oct 2023 21:09:20 +0200 Subject: [PATCH 04/15] added webViewSrc to builtin attrs --- src/services/builtin_attributes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/builtin_attributes.js b/src/services/builtin_attributes.js index c4388622ac..bfe28bc4a2 100644 --- a/src/services/builtin_attributes.js +++ b/src/services/builtin_attributes.js @@ -66,6 +66,7 @@ module.exports = [ { type: 'label', name: 'executeDescription'}, { type: 'label', name: 'newNotesOnTop'}, { type: 'label', name: 'clipperInbox'}, + { type: 'label', name: 'webViewSrc', isDangerous: true }, // relation names { type: 'relation', name: 'internalLink' }, From 840ac2d63e63ebd2f9a71c71fdabea60b95db112 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 14 Oct 2023 21:15:06 +0200 Subject: [PATCH 05/15] updates --- package-lock.json | 379 ++++++++++++++++++++++++++++++++-------------- package.json | 20 +-- 2 files changed, 274 insertions(+), 125 deletions(-) diff --git a/package-lock.json b/package-lock.json index a34bec4972..24ae2a6a10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "trilium", - "version": "0.61.8-beta", + "version": "0.61.9-beta", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "trilium", - "version": "0.61.8-beta", + "version": "0.61.9-beta", "hasInstallScript": true, "license": "AGPL-3.0-only", "dependencies": { "@braintree/sanitize-url": "6.0.4", - "@electron/remote": "2.0.11", + "@electron/remote": "2.0.12", "@excalidraw/excalidraw": "0.16.1", "archiver": "5.3.1", "async-mutex": "0.4.0", @@ -27,7 +27,7 @@ "debounce": "1.2.1", "ejs": "3.1.9", "electron-debug": "3.2.0", - "electron-dl": "3.5.0", + "electron-dl": "3.5.1", "electron-window-state": "5.0.3", "escape-html": "1.0.3", "express": "4.18.2", @@ -47,10 +47,10 @@ "jimp": "0.22.10", "joplin-turndown-plugin-gfm": "1.0.12", "jsdom": "22.1.0", - "marked": "9.1.0", + "marked": "9.1.2", "mime-types": "2.1.35", "multer": "1.4.5-lts.1", - "node-abi": "3.47.0", + "node-abi": "3.50.0", "normalize-strings": "1.1.1", "open": "8.4.1", "rand-token": "1.0.1", @@ -79,27 +79,27 @@ }, "devDependencies": { "cross-env": "7.0.3", - "electron": "25.9.0", + "electron": "25.9.1", "electron-builder": "24.6.4", "electron-packager": "17.1.2", "electron-rebuild": "3.2.9", - "eslint": "8.50.0", + "eslint": "8.51.0", "eslint-config-airbnb-base": "15.0.0", "eslint-config-prettier": "9.0.0", "eslint-plugin-import": "2.28.1", - "eslint-plugin-jsonc": "2.9.0", - "eslint-plugin-prettier": "5.0.0", + "eslint-plugin-jsonc": "2.10.0", + "eslint-plugin-prettier": "5.0.1", "esm": "3.2.25", "husky": "8.0.3", "jasmine": "5.1.0", "jsdoc": "4.0.2", "jsonc-eslint-parser": "2.3.0", - "lint-staged": "14.0.1", + "lint-staged": "15.0.0", "lorem-ipsum": "2.0.8", "nodemon": "3.0.1", "prettier": "3.0.3", "rcedit": "3.1.0", - "webpack": "5.88.2", + "webpack": "5.89.0", "webpack-cli": "5.1.4" }, "optionalDependencies": { @@ -326,9 +326,9 @@ } }, "node_modules/@electron/remote": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.11.tgz", - "integrity": "sha512-PYEs7W3GrQNuhgiMHjFEvL5MbAL6C7m1AwSAHGqC+xc33IdP7rcGtJSdTP2eg1ssyB3oI00KwTsiSlsQbAoXpA==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.12.tgz", + "integrity": "sha512-IJN6xLAxptq5MCvXNCU6+pdQyz0DjpPtX6g2TPJftu3Z9pU6BTdnos9ZMN8nK471LkASqiA6C+Hzjv5SS8PAQw==", "peerDependencies": { "electron": ">= 13.0.0" } @@ -447,9 +447,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz", - "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==", + "version": "8.51.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz", + "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -4276,9 +4276,9 @@ } }, "node_modules/electron": { - "version": "25.9.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.0.tgz", - "integrity": "sha512-wgscxf2ORHL/8mAQfy7l9rVDG//wrG9RUQndG508kCCMHRq9deFyZ4psOMzySheBRSfGMcFoRFYSlkAeZr8cFg==", + "version": "25.9.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.1.tgz", + "integrity": "sha512-Uo/Fh7igjoUXA/f90iTATZJesQEArVL1uLA672JefNWTLymdKSZkJKiCciu/Xnd0TS6qvdIOUGuJFSTQnKskXQ==", "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", @@ -4366,14 +4366,17 @@ } }, "node_modules/electron-dl": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.5.0.tgz", - "integrity": "sha512-Oj+VSuScVx8hEKM2HEvTQswTX6G3MLh7UoAz/oZuvKyNDfudNi1zY6PK/UnFoK1nCl9DF6k+3PFwElKbtZlDig==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.5.1.tgz", + "integrity": "sha512-5Yb9s/iPVJ5mW5x3j6XkKxt7WEqREr/AhYxZmtEfW1ffQHs1+aGoiQ2fXCAU6UIXMnWog2MXK82vrxJsjA3nbQ==", "dependencies": { "ext-name": "^5.0.0", "pupa": "^2.0.1", "unused-filename": "^2.1.0" }, + "engines": { + "node": ">=12" + }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } @@ -5001,15 +5004,15 @@ } }, "node_modules/eslint": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz", - "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==", + "version": "8.51.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz", + "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.50.0", + "@eslint/js": "8.51.0", "@humanwhocodes/config-array": "^0.11.11", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -5054,6 +5057,18 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-compat-utils": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.1.2.tgz", + "integrity": "sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "eslint": ">=6.0.0" + } + }, "node_modules/eslint-config-airbnb-base": { "version": "15.0.0", "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz", @@ -5220,12 +5235,13 @@ } }, "node_modules/eslint-plugin-jsonc": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.9.0.tgz", - "integrity": "sha512-RK+LeONVukbLwT2+t7/OY54NJRccTXh/QbnXzPuTLpFMVZhPuq1C9E07+qWenGx7rrQl0kAalAWl7EmB+RjpGA==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.10.0.tgz", + "integrity": "sha512-9d//o6Jyh4s1RxC9fNSt1+MMaFN2ruFdXPG9XZcb/mR2KkfjADYiNL/hbU6W0Cyxfg3tS/XSFuhl5LgtMD8hmw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", + "eslint-compat-utils": "^0.1.2", "jsonc-eslint-parser": "^2.0.4", "natural-compare": "^1.4.0" }, @@ -5240,9 +5256,9 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz", - "integrity": "sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.1.tgz", + "integrity": "sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==", "dev": true, "dependencies": { "prettier-linter-helpers": "^1.0.0", @@ -8265,27 +8281,27 @@ } }, "node_modules/lint-staged": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-14.0.1.tgz", - "integrity": "sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.0.0.tgz", + "integrity": "sha512-OdrAd/qZhO4MnPyNRehI1Fh6j8kcfQoGpjQ1Vw8dSkDkNONdqe/HpKXqtKpFIPCAYeF4/tfnE11MnjLYuLKjqA==", "dev": true, "dependencies": { "chalk": "5.3.0", - "commander": "11.0.0", + "commander": "11.1.0", "debug": "4.3.4", - "execa": "7.2.0", + "execa": "8.0.1", "lilconfig": "2.1.0", - "listr2": "6.6.1", + "listr2": "7.0.1", "micromatch": "4.0.5", "pidtree": "0.6.0", "string-argv": "0.3.2", - "yaml": "2.3.1" + "yaml": "2.3.2" }, "bin": { "lint-staged": "bin/lint-staged.js" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": ">=18.12.0" }, "funding": { "url": "https://opencollective.com/lint-staged" @@ -8304,18 +8320,101 @@ } }, "node_modules/lint-staged/node_modules/commander": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz", - "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", + "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", + "dev": true, + "engines": { + "node": ">=16" + } + }, + "node_modules/lint-staged/node_modules/execa": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^8.0.1", + "human-signals": "^5.0.0", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^4.1.0", + "strip-final-newline": "^3.0.0" + }, + "engines": { + "node": ">=16.17" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/lint-staged/node_modules/get-stream": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", "dev": true, "engines": { "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lint-staged/node_modules/human-signals": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", + "dev": true, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/lint-staged/node_modules/mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lint-staged/node_modules/onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, + "dependencies": { + "mimic-fn": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lint-staged/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/listr2": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz", - "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-7.0.1.tgz", + "integrity": "sha512-nz+7hwgbDp8eWNoDgzdl4hA/xDSLrNRzPu1TLgOYs6l5Y+Ma6zVWWy9Oyt9TQFONwKoSPoka3H50D3vD5EuNwg==", "dev": true, "dependencies": { "cli-truncate": "^3.1.0", @@ -8327,14 +8426,6 @@ }, "engines": { "node": ">=16.0.0" - }, - "peerDependencies": { - "enquirer": ">= 2.3.0 < 3" - }, - "peerDependenciesMeta": { - "enquirer": { - "optional": true - } } }, "node_modules/listr2/node_modules/ansi-regex": { @@ -8946,9 +9037,9 @@ } }, "node_modules/marked": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.0.tgz", - "integrity": "sha512-VZjm0PM5DMv7WodqOUps3g6Q7dmxs9YGiFUZ7a2majzQTTCgX+6S6NAJHPvOhgFBzYz8s4QZKWWMfZKFmsfOgA==", + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.2.tgz", + "integrity": "sha512-qoKMJqK0w6vkLk8+KnKZAH6neUZSNaQqVZ/h2yZ9S7CbLuFHyS2viB0jnqcWF9UKjwsAbMrQtnQhdmdvOVOw9w==", "bin": { "marked": "bin/marked.js" }, @@ -9294,9 +9385,9 @@ "dev": true }, "node_modules/node-abi": { - "version": "3.47.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz", - "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==", + "version": "3.50.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.50.0.tgz", + "integrity": "sha512-2Gxu7Eq7vnBIRfYSmqPruEllMM14FjOQFJSoqdGWthVn+tmwEXzmdPpya6cvvwf0uZA3F5N1fMFr9mijZBplFA==", "dependencies": { "semver": "^7.3.5" }, @@ -12841,9 +12932,9 @@ } }, "node_modules/webpack": { - "version": "5.88.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", - "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", + "version": "5.89.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", + "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", @@ -13221,9 +13312,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", - "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz", + "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==", "dev": true, "engines": { "node": ">= 14" @@ -13481,9 +13572,9 @@ } }, "@electron/remote": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.11.tgz", - "integrity": "sha512-PYEs7W3GrQNuhgiMHjFEvL5MbAL6C7m1AwSAHGqC+xc33IdP7rcGtJSdTP2eg1ssyB3oI00KwTsiSlsQbAoXpA==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.12.tgz", + "integrity": "sha512-IJN6xLAxptq5MCvXNCU6+pdQyz0DjpPtX6g2TPJftu3Z9pU6BTdnos9ZMN8nK471LkASqiA6C+Hzjv5SS8PAQw==", "requires": {} }, "@electron/universal": { @@ -13572,9 +13663,9 @@ } }, "@eslint/js": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz", - "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==", + "version": "8.51.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz", + "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==", "dev": true }, "@excalidraw/excalidraw": { @@ -16542,9 +16633,9 @@ } }, "electron": { - "version": "25.9.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.0.tgz", - "integrity": "sha512-wgscxf2ORHL/8mAQfy7l9rVDG//wrG9RUQndG508kCCMHRq9deFyZ4psOMzySheBRSfGMcFoRFYSlkAeZr8cFg==", + "version": "25.9.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.1.tgz", + "integrity": "sha512-Uo/Fh7igjoUXA/f90iTATZJesQEArVL1uLA672JefNWTLymdKSZkJKiCciu/Xnd0TS6qvdIOUGuJFSTQnKskXQ==", "requires": { "@electron/get": "^2.0.0", "@types/node": "^18.11.18", @@ -16609,9 +16700,9 @@ } }, "electron-dl": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.5.0.tgz", - "integrity": "sha512-Oj+VSuScVx8hEKM2HEvTQswTX6G3MLh7UoAz/oZuvKyNDfudNi1zY6PK/UnFoK1nCl9DF6k+3PFwElKbtZlDig==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.5.1.tgz", + "integrity": "sha512-5Yb9s/iPVJ5mW5x3j6XkKxt7WEqREr/AhYxZmtEfW1ffQHs1+aGoiQ2fXCAU6UIXMnWog2MXK82vrxJsjA3nbQ==", "requires": { "ext-name": "^5.0.0", "pupa": "^2.0.1", @@ -17103,15 +17194,15 @@ "dev": true }, "eslint": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz", - "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==", + "version": "8.51.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz", + "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.50.0", + "@eslint/js": "8.51.0", "@humanwhocodes/config-array": "^0.11.11", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -17217,6 +17308,13 @@ } } }, + "eslint-compat-utils": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.1.2.tgz", + "integrity": "sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==", + "dev": true, + "requires": {} + }, "eslint-config-airbnb-base": { "version": "15.0.0", "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz", @@ -17356,20 +17454,21 @@ } }, "eslint-plugin-jsonc": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.9.0.tgz", - "integrity": "sha512-RK+LeONVukbLwT2+t7/OY54NJRccTXh/QbnXzPuTLpFMVZhPuq1C9E07+qWenGx7rrQl0kAalAWl7EmB+RjpGA==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.10.0.tgz", + "integrity": "sha512-9d//o6Jyh4s1RxC9fNSt1+MMaFN2ruFdXPG9XZcb/mR2KkfjADYiNL/hbU6W0Cyxfg3tS/XSFuhl5LgtMD8hmw==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", + "eslint-compat-utils": "^0.1.2", "jsonc-eslint-parser": "^2.0.4", "natural-compare": "^1.4.0" } }, "eslint-plugin-prettier": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz", - "integrity": "sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.1.tgz", + "integrity": "sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==", "dev": true, "requires": { "prettier-linter-helpers": "^1.0.0", @@ -19504,21 +19603,21 @@ } }, "lint-staged": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-14.0.1.tgz", - "integrity": "sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.0.0.tgz", + "integrity": "sha512-OdrAd/qZhO4MnPyNRehI1Fh6j8kcfQoGpjQ1Vw8dSkDkNONdqe/HpKXqtKpFIPCAYeF4/tfnE11MnjLYuLKjqA==", "dev": true, "requires": { "chalk": "5.3.0", - "commander": "11.0.0", + "commander": "11.1.0", "debug": "4.3.4", - "execa": "7.2.0", + "execa": "8.0.1", "lilconfig": "2.1.0", - "listr2": "6.6.1", + "listr2": "7.0.1", "micromatch": "4.0.5", "pidtree": "0.6.0", "string-argv": "0.3.2", - "yaml": "2.3.1" + "yaml": "2.3.2" }, "dependencies": { "chalk": { @@ -19528,17 +19627,67 @@ "dev": true }, "commander": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz", - "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", + "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", + "dev": true + }, + "execa": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "get-stream": "^8.0.1", + "human-signals": "^5.0.0", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^4.1.0", + "strip-final-newline": "^3.0.0" + } + }, + "get-stream": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", + "dev": true + }, + "human-signals": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", + "dev": true + }, + "mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "dev": true + }, + "onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, + "requires": { + "mimic-fn": "^4.0.0" + } + }, + "signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true } } }, "listr2": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz", - "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-7.0.1.tgz", + "integrity": "sha512-nz+7hwgbDp8eWNoDgzdl4hA/xDSLrNRzPu1TLgOYs6l5Y+Ma6zVWWy9Oyt9TQFONwKoSPoka3H50D3vD5EuNwg==", "dev": true, "requires": { "cli-truncate": "^3.1.0", @@ -19990,9 +20139,9 @@ "requires": {} }, "marked": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.0.tgz", - "integrity": "sha512-VZjm0PM5DMv7WodqOUps3g6Q7dmxs9YGiFUZ7a2majzQTTCgX+6S6NAJHPvOhgFBzYz8s4QZKWWMfZKFmsfOgA==" + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.2.tgz", + "integrity": "sha512-qoKMJqK0w6vkLk8+KnKZAH6neUZSNaQqVZ/h2yZ9S7CbLuFHyS2viB0jnqcWF9UKjwsAbMrQtnQhdmdvOVOw9w==" }, "matcher": { "version": "3.0.0", @@ -20248,9 +20397,9 @@ "dev": true }, "node-abi": { - "version": "3.47.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz", - "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==", + "version": "3.50.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.50.0.tgz", + "integrity": "sha512-2Gxu7Eq7vnBIRfYSmqPruEllMM14FjOQFJSoqdGWthVn+tmwEXzmdPpya6cvvwf0uZA3F5N1fMFr9mijZBplFA==", "requires": { "semver": "^7.3.5" } @@ -22923,9 +23072,9 @@ "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==" }, "webpack": { - "version": "5.88.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", - "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", + "version": "5.89.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", + "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.3", @@ -23188,9 +23337,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "yaml": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", - "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz", + "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==", "dev": true }, "yargs": { diff --git a/package.json b/package.json index d91151dcb9..5ef1d79500 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@braintree/sanitize-url": "6.0.4", - "@electron/remote": "2.0.11", + "@electron/remote": "2.0.12", "@excalidraw/excalidraw": "0.16.1", "archiver": "5.3.1", "async-mutex": "0.4.0", @@ -48,7 +48,7 @@ "debounce": "1.2.1", "ejs": "3.1.9", "electron-debug": "3.2.0", - "electron-dl": "3.5.0", + "electron-dl": "3.5.1", "electron-window-state": "5.0.3", "escape-html": "1.0.3", "express": "4.18.2", @@ -68,10 +68,10 @@ "jimp": "0.22.10", "joplin-turndown-plugin-gfm": "1.0.12", "jsdom": "22.1.0", - "marked": "9.1.0", + "marked": "9.1.2", "mime-types": "2.1.35", "multer": "1.4.5-lts.1", - "node-abi": "3.47.0", + "node-abi": "3.50.0", "normalize-strings": "1.1.1", "open": "8.4.1", "rand-token": "1.0.1", @@ -97,27 +97,27 @@ }, "devDependencies": { "cross-env": "7.0.3", - "electron": "25.9.0", + "electron": "25.9.1", "electron-builder": "24.6.4", "electron-packager": "17.1.2", "electron-rebuild": "3.2.9", - "eslint": "8.50.0", + "eslint": "8.51.0", "eslint-config-airbnb-base": "15.0.0", "eslint-config-prettier": "9.0.0", "eslint-plugin-import": "2.28.1", - "eslint-plugin-jsonc": "2.9.0", - "eslint-plugin-prettier": "5.0.0", + "eslint-plugin-jsonc": "2.10.0", + "eslint-plugin-prettier": "5.0.1", "esm": "3.2.25", "husky": "8.0.3", "jasmine": "5.1.0", "jsdoc": "4.0.2", "jsonc-eslint-parser": "2.3.0", - "lint-staged": "14.0.1", + "lint-staged": "15.0.0", "lorem-ipsum": "2.0.8", "nodemon": "3.0.1", "prettier": "3.0.3", "rcedit": "3.1.0", - "webpack": "5.88.2", + "webpack": "5.89.0", "webpack-cli": "5.1.4" }, "optionalDependencies": { From ba34df2e15444e667c8f6a6eb1ff727eb6468896 Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 18 Oct 2023 09:24:13 +0200 Subject: [PATCH 06/15] typo --- src/services/import/zip.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/import/zip.js b/src/services/import/zip.js index fcdb0cb5b5..d4c591610c 100644 --- a/src/services/import/zip.js +++ b/src/services/import/zip.js @@ -311,7 +311,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) { return /^(?:[a-z]+:)?\/\//i.test(url); } - content = removeTrilumTags(content); + content = removeTriliumTags(content); content = content.replace(/

([^<]*)<\/h1>/gi, (match, text) => { if (noteTitle.trim() === text.trim()) { @@ -393,7 +393,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) { return content; } - function removeTrilumTags(content) { + function removeTriliumTags(content) { const tagsToRemove = [ '

([^<]*)<\/h1>', '([^<]*)<\/title>' From c666fc3b981d4aade0c7e6d38a4a3c6fda3c46bc Mon Sep 17 00:00:00 2001 From: zadam <zadam.apps@gmail.com> Date: Wed, 18 Oct 2023 09:33:24 +0200 Subject: [PATCH 07/15] make sure exact noteId match comes on the top in search --- src/services/search/search_result.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/services/search/search_result.js b/src/services/search/search_result.js index 4c678661de..ca3811f8ec 100644 --- a/src/services/search/search_result.js +++ b/src/services/search/search_result.js @@ -22,6 +22,10 @@ class SearchResult { const note = becca.notes[this.noteId]; + if (note.noteId.toLowerCase() === fulltextQuery) { + this.score += 100; + } + if (note.title.toLowerCase() === fulltextQuery) { this.score += 100; // high reward for exact match #3470 } From b764761e5814bee9fb587ba5f0d6a87e34963651 Mon Sep 17 00:00:00 2001 From: zadam <zadam.apps@gmail.com> Date: Wed, 18 Oct 2023 09:36:49 +0200 Subject: [PATCH 08/15] run local dev with TRILIUM_SAFE_MODE as a safety precaution --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5ef1d79500..6e124be633 100644 --- a/package.json +++ b/package.json @@ -13,10 +13,10 @@ "url": "https://github.com/zadam/trilium.git" }, "scripts": { - "start-server": "cross-env TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon ./src/www", - "start-server-no-dir": "cross-env TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon ./src/www", - "start-electron": "cross-env TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron --inspect=5858 .", - "start-electron-no-dir": "cross-env TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 electron --inspect=5858 .", + "start-server": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon ./src/www", + "start-server-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon ./src/www", + "start-electron": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron --inspect=5858 .", + "start-electron-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 electron --inspect=5858 .", "switch-server": "rm -rf ./node_modules/better-sqlite3 && npm install", "switch-electron": "./node_modules/.bin/electron-rebuild", "build-backend-docs": "rm -rf ./docs/backend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/backend_api src/becca/entities/*.js src/services/backend_script_api.js src/services/sql.js", From d5271c17e33af5c9a6fd399455ffac1292f7ad86 Mon Sep 17 00:00:00 2001 From: zadam <zadam.apps@gmail.com> Date: Wed, 18 Oct 2023 09:37:36 +0200 Subject: [PATCH 09/15] fix sync bug --- src/services/sync_update.js | 70 ++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/src/services/sync_update.js b/src/services/sync_update.js index 919f3c8cea..d5bb4ab302 100644 --- a/src/services/sync_update.js +++ b/src/services/sync_update.js @@ -68,43 +68,28 @@ function updateEntity(remoteEC, remoteEntityRow, instanceId, updateContext) { function updateNormalEntity(remoteEC, remoteEntityRow, instanceId, updateContext) { const localEC = sql.getRow(`SELECT * FROM entity_changes WHERE entityName = ? AND entityId = ?`, [remoteEC.entityName, remoteEC.entityId]); - if (!localEC?.isErased && remoteEC.isErased) { - eraseEntity(remoteEC, instanceId); - updateContext.erased++; - - return true; - } else if (localEC?.isErased && !remoteEC.isErased) { - // on this side, we can't unerase the entity, so force the entity to be erased on the other side. - entityChangesService.putEntityChangeForOtherInstances(localEC); - - return false; - } else if (localEC?.isErased && remoteEC.isErased) { - updateContext.alreadyErased++; - return false; - } - if (!localEC || localEC.utcDateChanged <= remoteEC.utcDateChanged) { - if (!remoteEntityRow) { - throw new Error(`Empty entity row for: ${JSON.stringify(remoteEC)}`); - } - - if (remoteEC.entityName === 'blobs' && remoteEntityRow.content !== null) { - // we always use a Buffer object which is different from normal saving - there we use a simple string type for - // "string notes". The problem is that in general, it's not possible to detect whether a blob content - // is string note or note (syncs can arrive out of order) - remoteEntityRow.content = Buffer.from(remoteEntityRow.content, 'base64'); - - if (remoteEntityRow.content.byteLength === 0) { - // there seems to be a bug which causes empty buffer to be stored as NULL which is then picked up as inconsistency - // (possibly not a problem anymore with the newer better-sqlite3) - remoteEntityRow.content = ""; + if (remoteEC.isErased) { + if (localEC?.isErased) { + eraseEntity(remoteEC); // make sure it's erased anyway + updateContext.alreadyErased++; + return false; // we won't save entitychange in this case + } else { + eraseEntity(remoteEC); + updateContext.erased++; + } + } else { + if (!remoteEntityRow) { + throw new Error(`Empty entity row for: ${JSON.stringify(remoteEC)}`); } - } - sql.replace(remoteEC.entityName, remoteEntityRow); + preProcessContent(remoteEC, remoteEntityRow); - updateContext.updated[remoteEC.entityName] = updateContext.updated[remoteEC.entityName] || []; - updateContext.updated[remoteEC.entityName].push(remoteEC.entityId); + sql.replace(remoteEC.entityName, remoteEntityRow); + + updateContext.updated[remoteEC.entityName] = updateContext.updated[remoteEC.entityName] || []; + updateContext.updated[remoteEC.entityName].push(remoteEC.entityId); + } if (!localEC || localEC.utcDateChanged < remoteEC.utcDateChanged || localEC.hash !== remoteEC.hash) { entityChangesService.putEntityChangeWithInstanceId(remoteEC, instanceId); @@ -121,6 +106,21 @@ function updateNormalEntity(remoteEC, remoteEntityRow, instanceId, updateContext return false; } +function preProcessContent(remoteEC, remoteEntityRow) { + if (remoteEC.entityName === 'blobs' && remoteEntityRow.content !== null) { + // we always use a Buffer object which is different from normal saving - there we use a simple string type for + // "string notes". The problem is that in general, it's not possible to detect whether a blob content + // is string note or note (syncs can arrive out of order) + remoteEntityRow.content = Buffer.from(remoteEntityRow.content, 'base64'); + + if (remoteEntityRow.content.byteLength === 0) { + // there seems to be a bug which causes empty buffer to be stored as NULL which is then picked up as inconsistency + // (possibly not a problem anymore with the newer better-sqlite3) + remoteEntityRow.content = ""; + } + } +} + function updateNoteReordering(remoteEC, remoteEntityRow, instanceId) { if (!remoteEntityRow) { throw new Error(`Empty note_reordering body for: ${JSON.stringify(remoteEC)}`); @@ -135,7 +135,7 @@ function updateNoteReordering(remoteEC, remoteEntityRow, instanceId) { return true; } -function eraseEntity(entityChange, instanceId) { +function eraseEntity(entityChange) { const {entityName, entityId} = entityChange; const entityNames = [ @@ -155,8 +155,6 @@ function eraseEntity(entityChange, instanceId) { const primaryKeyName = entityConstructor.getEntityFromEntityName(entityName).primaryKeyName; sql.execute(`DELETE FROM ${entityName} WHERE ${primaryKeyName} = ?`, [entityId]); - - entityChangesService.putEntityChangeWithInstanceId(entityChange, instanceId); } function logUpdateContext(updateContext) { From 2132cf3bdcc4bc58dd3656cbedac05957ff26897 Mon Sep 17 00:00:00 2001 From: zadam <zadam.apps@gmail.com> Date: Wed, 18 Oct 2023 09:40:00 +0200 Subject: [PATCH 10/15] nodejs 18.18.2 --- .gitpod.yml | 2 +- Dockerfile | 2 +- bin/build-server.sh | 2 +- bin/copy-trilium.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 7c304f56ad..65ce500155 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,7 +2,7 @@ image: file: .gitpod.dockerfile tasks: - - before: nvm install 18.18.0 && nvm use 18.18.0 + - before: nvm install 18.18.2 && nvm use 18.18.2 init: npm install command: npm run start-server diff --git a/Dockerfile b/Dockerfile index 85c17226d9..d8cb9b0c34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!! -FROM node:18.18.0-alpine +FROM node:18.18.2-alpine # Create app directory WORKDIR /usr/src/app diff --git a/bin/build-server.sh b/bin/build-server.sh index a3624814ae..6299908c2a 100755 --- a/bin/build-server.sh +++ b/bin/build-server.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash PKG_DIR=dist/trilium-linux-x64-server -NODE_VERSION=18.18.0 +NODE_VERSION=18.18.2 if [ "$1" != "DONTCOPY" ] then diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh index c009d16a22..624defa90b 100755 --- a/bin/copy-trilium.sh +++ b/bin/copy-trilium.sh @@ -5,7 +5,7 @@ if [[ $# -eq 0 ]] ; then exit 1 fi -n exec 18.18.0 npm run webpack +n exec 18.18.2 npm run webpack DIR=$1 @@ -27,7 +27,7 @@ cp -r electron.js $DIR/ cp webpack-* $DIR/ # run in subshell (so we return to original dir) -(cd $DIR && n exec 18.18.0 npm install --only=prod) +(cd $DIR && n exec 18.18.2 npm install --only=prod) # cleanup of useless files in dependencies rm -r $DIR/node_modules/image-q/demo From 148bff9f7785719600664fed438205488a375b82 Mon Sep 17 00:00:00 2001 From: zadam <zadam.apps@gmail.com> Date: Wed, 18 Oct 2023 23:16:47 +0200 Subject: [PATCH 11/15] show existing backups and anonymized DBs, #4321 --- package-lock.json | 14 +++++------ package.json | 2 +- .../advanced/database_anonymization.js | 24 +++++++++++++++++++ .../widgets/type_widgets/options/backup.js | 22 +++++++++++++++++ src/routes/api/database.js | 22 ++++++++++++----- src/routes/routes.js | 2 ++ src/services/anonymization.js | 17 ++++++++++++- src/services/backup.js | 15 ++++++++++++ 8 files changed, 103 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 24ae2a6a10..6f7731af67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -79,7 +79,7 @@ }, "devDependencies": { "cross-env": "7.0.3", - "electron": "25.9.1", + "electron": "25.9.2", "electron-builder": "24.6.4", "electron-packager": "17.1.2", "electron-rebuild": "3.2.9", @@ -4276,9 +4276,9 @@ } }, "node_modules/electron": { - "version": "25.9.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.1.tgz", - "integrity": "sha512-Uo/Fh7igjoUXA/f90iTATZJesQEArVL1uLA672JefNWTLymdKSZkJKiCciu/Xnd0TS6qvdIOUGuJFSTQnKskXQ==", + "version": "25.9.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.2.tgz", + "integrity": "sha512-hVBN5rsrL99BKNHvzMeYy2PkAmewuIobu4U3o3EzVz4MDoLmMfW4yTH5GZ4RbJrpokoEky5IzGtRR/ggPzL6Fw==", "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", @@ -16633,9 +16633,9 @@ } }, "electron": { - "version": "25.9.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.1.tgz", - "integrity": "sha512-Uo/Fh7igjoUXA/f90iTATZJesQEArVL1uLA672JefNWTLymdKSZkJKiCciu/Xnd0TS6qvdIOUGuJFSTQnKskXQ==", + "version": "25.9.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.2.tgz", + "integrity": "sha512-hVBN5rsrL99BKNHvzMeYy2PkAmewuIobu4U3o3EzVz4MDoLmMfW4yTH5GZ4RbJrpokoEky5IzGtRR/ggPzL6Fw==", "requires": { "@electron/get": "^2.0.0", "@types/node": "^18.11.18", diff --git a/package.json b/package.json index 6e124be633..ff3526a0ba 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ }, "devDependencies": { "cross-env": "7.0.3", - "electron": "25.9.1", + "electron": "25.9.2", "electron-builder": "24.6.4", "electron-packager": "17.1.2", "electron-rebuild": "3.2.9", diff --git a/src/public/app/widgets/type_widgets/options/advanced/database_anonymization.js b/src/public/app/widgets/type_widgets/options/advanced/database_anonymization.js index a17e0675b1..9bdcce843e 100644 --- a/src/public/app/widgets/type_widgets/options/advanced/database_anonymization.js +++ b/src/public/app/widgets/type_widgets/options/advanced/database_anonymization.js @@ -20,6 +20,10 @@ const TPL = ` <p>You can decide yourself if you want to provide a fully or lightly anonymized database. Even fully anonymized DB is very useful, however in some cases lightly anonymized database can speed up the process of bug identification and fixing.</p> <button class="anonymize-light-button btn">Save lightly anonymized database</button> + + <h5>Existing anonymized databases</h5> + + <ul class="existing-anonymized-databases"></ul> </div>`; export default class DatabaseAnonymizationOptions extends OptionsWidget { @@ -38,6 +42,8 @@ export default class DatabaseAnonymizationOptions extends OptionsWidget { else { toastService.showMessage(`Created fully anonymized database in ${resp.anonymizedFilePath}`, 10000); } + + this.refresh(); }); this.$anonymizeLightButton.on('click', async () => { @@ -51,6 +57,24 @@ export default class DatabaseAnonymizationOptions extends OptionsWidget { else { toastService.showMessage(`Created lightly anonymized database in ${resp.anonymizedFilePath}`, 10000); } + + this.refresh(); + }); + + this.$existingAnonymizedDatabases = this.$widget.find(".existing-anonymized-databases"); + } + + optionsLoaded(options) { + server.get("database/anonymized-databases").then(anonymizedDatabases => { + this.$existingAnonymizedDatabases.empty(); + + if (!anonymizedDatabases.length) { + anonymizedDatabases = [{filePath: "no anonymized database yet"}]; + } + + for (const {filePath} of anonymizedDatabases) { + this.$existingAnonymizedDatabases.append($("<li>").text(filePath)); + } }); } } diff --git a/src/public/app/widgets/type_widgets/options/backup.js b/src/public/app/widgets/type_widgets/options/backup.js index d5430d30b2..a5c5b0c13f 100644 --- a/src/public/app/widgets/type_widgets/options/backup.js +++ b/src/public/app/widgets/type_widgets/options/backup.js @@ -37,6 +37,12 @@ const TPL = ` <button class="backup-database-button btn">Backup database now</button> </div> + +<div class="options-section"> + <h4>Existing backups</h4> + + <ul class="existing-backup-list"></ul> +</div> `; export default class BackupOptions extends OptionsWidget { @@ -49,6 +55,8 @@ export default class BackupOptions extends OptionsWidget { const {backupFile} = await server.post('database/backup-database'); toastService.showMessage(`Database has been backed up to ${backupFile}`, 10000); + + this.refresh(); }); this.$dailyBackupEnabled = this.$widget.find(".daily-backup-enabled"); @@ -63,11 +71,25 @@ export default class BackupOptions extends OptionsWidget { this.$monthlyBackupEnabled.on('change', () => this.updateCheckboxOption('monthlyBackupEnabled', this.$monthlyBackupEnabled)); + + this.$existingBackupList = this.$widget.find(".existing-backup-list"); } optionsLoaded(options) { this.setCheckboxState(this.$dailyBackupEnabled, options.dailyBackupEnabled); this.setCheckboxState(this.$weeklyBackupEnabled, options.weeklyBackupEnabled); this.setCheckboxState(this.$monthlyBackupEnabled, options.monthlyBackupEnabled); + + server.get("database/backups").then(backupFiles => { + this.$existingBackupList.empty(); + + if (!backupFiles.length) { + backupFiles = [{filePath: "no backup yet"}]; + } + + for (const {filePath} of backupFiles) { + this.$existingBackupList.append($("<li>").text(filePath)); + } + }); } } diff --git a/src/routes/api/database.js b/src/routes/api/database.js index 27658f39dd..d8d8cfa9a9 100644 --- a/src/routes/api/database.js +++ b/src/routes/api/database.js @@ -6,8 +6,8 @@ const backupService = require('../../services/backup'); const anonymizationService = require('../../services/anonymization'); const consistencyChecksService = require('../../services/consistency_checks'); -async function anonymize(req) { - return await anonymizationService.createAnonymizedCopy(req.params.type); +function getExistingBackups() { + return backupService.getExistingBackups(); } async function backupDatabase() { @@ -22,6 +22,18 @@ function vacuumDatabase() { log.info("Database has been vacuumed."); } +function findAndFixConsistencyIssues() { + consistencyChecksService.runOnDemandChecks(true); +} + +function getExistingAnonymizedDatabases() { + return anonymizationService.getExistingAnonymizedDatabases(); +} + +async function anonymize(req) { + return await anonymizationService.createAnonymizedCopy(req.params.type); +} + function checkIntegrity() { const results = sql.getRows("PRAGMA integrity_check"); @@ -32,14 +44,12 @@ function checkIntegrity() { }; } -function findAndFixConsistencyIssues() { - consistencyChecksService.runOnDemandChecks(true); -} - module.exports = { + getExistingBackups, backupDatabase, vacuumDatabase, findAndFixConsistencyIssues, + getExistingAnonymizedDatabases, anonymize, checkIntegrity }; diff --git a/src/routes/routes.js b/src/routes/routes.js index 97a2f8de89..1cbe4cd83f 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -289,9 +289,11 @@ function register(app) { apiRoute(GET, '/api/sql/schema', sqlRoute.getSchema); apiRoute(PST, '/api/sql/execute/:noteId', sqlRoute.execute); route(PST, '/api/database/anonymize/:type', [auth.checkApiAuthOrElectron, csrfMiddleware], databaseRoute.anonymize, apiResultHandler, false); + apiRoute(GET, '/api/database/anonymized-databases', databaseRoute.getExistingAnonymizedDatabases); // backup requires execution outside of transaction route(PST, '/api/database/backup-database', [auth.checkApiAuthOrElectron, csrfMiddleware], databaseRoute.backupDatabase, apiResultHandler, false); + apiRoute(GET, '/api/database/backups', databaseRoute.getExistingBackups); // VACUUM requires execution outside of transaction route(PST, '/api/database/vacuum-database', [auth.checkApiAuthOrElectron, csrfMiddleware], databaseRoute.vacuumDatabase, apiResultHandler, false); diff --git a/src/services/anonymization.js b/src/services/anonymization.js index 877a9b38b8..160b6e2a21 100644 --- a/src/services/anonymization.js +++ b/src/services/anonymization.js @@ -4,6 +4,7 @@ const dataDir = require("./data_dir"); const dateUtils = require("./date_utils"); const Database = require("better-sqlite3"); const sql = require("./sql"); +const path = require("path"); function getFullAnonymizationScript() { // we want to delete all non-builtin attributes because they can contain sensitive names and values @@ -70,7 +71,21 @@ async function createAnonymizedCopy(type) { }; } +function getExistingAnonymizedDatabases() { + if (!fs.existsSync(dataDir.ANONYMIZED_DB_DIR)) { + return []; + } + + return fs.readdirSync(dataDir.ANONYMIZED_DB_DIR) + .filter(fileName => fileName.includes("anonymized")) + .map(fileName => ({ + fileName: fileName, + filePath: path.resolve(dataDir.ANONYMIZED_DB_DIR, fileName) + })); +} + module.exports = { getFullAnonymizationScript, - createAnonymizedCopy + createAnonymizedCopy, + getExistingAnonymizedDatabases } diff --git a/src/services/backup.js b/src/services/backup.js index c7908524f3..808331ff93 100644 --- a/src/services/backup.js +++ b/src/services/backup.js @@ -8,6 +8,20 @@ const log = require('./log'); const syncMutexService = require('./sync_mutex'); const cls = require('./cls'); const sql = require('./sql'); +const path = require('path'); + +function getExistingBackups() { + if (!fs.existsSync(dataDir.BACKUP_DIR)) { + return []; + } + + return fs.readdirSync(dataDir.BACKUP_DIR) + .filter(fileName => fileName.includes("backup")) + .map(fileName => ({ + fileName: fileName, + filePath: path.resolve(dataDir.BACKUP_DIR, fileName) + })); +} function regularBackup() { cls.init(() => { @@ -58,6 +72,7 @@ if (!fs.existsSync(dataDir.BACKUP_DIR)) { } module.exports = { + getExistingBackups, backupNow, regularBackup }; From 5b2ba3646df6c5c48b52ff9803974a326225f913 Mon Sep 17 00:00:00 2001 From: zadam <zadam.apps@gmail.com> Date: Wed, 18 Oct 2023 23:23:20 +0200 Subject: [PATCH 12/15] removed maxTouchPoints condition for detection of mobile browsers, #4316 --- src/views/login.ejs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/login.ejs b/src/views/login.ejs index 9fd72c2f4c..392e6e854b 100644 --- a/src/views/login.ejs +++ b/src/views/login.ejs @@ -68,8 +68,6 @@ // https://stackoverflow.com/a/73731646/944162 function isMobile() { - if ('maxTouchPoints' in navigator) return navigator.maxTouchPoints > 0; - const mQ = matchMedia?.('(pointer:coarse)'); if (mQ?.media === '(pointer:coarse)') return !!mQ.matches; From 67a12d3c4dc45f3e4682a3dfb1be2e227ec804d9 Mon Sep 17 00:00:00 2001 From: zadam <zadam.apps@gmail.com> Date: Thu, 19 Oct 2023 00:13:11 +0200 Subject: [PATCH 13/15] improve sync error logging --- src/services/request.js | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/src/services/request.js b/src/services/request.js index b67b807f34..0af02b7ea8 100644 --- a/src/services/request.js +++ b/src/services/request.js @@ -58,10 +58,6 @@ function exec(opts) { request.on('error', err => reject(generateError(opts, err))); request.on('response', response => { - if (![200, 201, 204].includes(response.statusCode)) { - reject(generateError(opts, `${response.statusCode} ${response.statusMessage}`)); - } - if (opts.cookieJar && response.headers['set-cookie']) { opts.cookieJar.header = response.headers['set-cookie']; } @@ -71,15 +67,28 @@ function exec(opts) { response.on('data', chunk => responseStr += chunk); response.on('end', () => { - try { - const jsonObj = responseStr.trim() ? JSON.parse(responseStr) : null; + if ([200, 201, 204].includes(response.statusCode)) { + try { + const jsonObj = responseStr.trim() ? JSON.parse(responseStr) : null; - resolve(jsonObj); - } - catch (e) { - log.error(`Failed to deserialize sync response: ${responseStr}`); + resolve(jsonObj); + } catch (e) { + log.error(`Failed to deserialize sync response: ${responseStr}`); + + reject(generateError(opts, e.message)); + } + } else { + let errorMessage; + + try { + const jsonObj = JSON.parse(responseStr); + + errorMessage = jsonObj?.message || ''; + } catch (e) { + errorMessage = responseStr.substr(0, Math.min(responseStr.length, 100)); + } - reject(generateError(opts, e.message)); + reject(generateError(opts, `${response.statusCode} ${response.statusMessage} ${errorMessage}`)); } }); }); From 0a172d8bc1cbb39900b08fe4d0c67d0590ae8560 Mon Sep 17 00:00:00 2001 From: zadam <zadam.apps@gmail.com> Date: Thu, 19 Oct 2023 00:29:03 +0200 Subject: [PATCH 14/15] add api.runOutsideOfSync() to backend script API, #4327 --- docs/backend_api/AbstractBeccaEntity.html | 42 +- docs/backend_api/BAttachment.html | 136 ++-- docs/backend_api/BAttribute.html | 98 +-- docs/backend_api/BBranch.html | 92 +-- docs/backend_api/BEtapiToken.html | 44 +- docs/backend_api/BNote.html | 370 +++++------ docs/backend_api/BOption.html | 44 +- docs/backend_api/BRecentNote.html | 44 +- docs/backend_api/BRevision.html | 584 +++++++++++++++++- docs/backend_api/BackendScriptApi.html | 246 ++++++-- ...cca_entities_abstract_becca_entity.js.html | 54 +- .../becca_entities_battachment.js.html | 3 +- docs/backend_api/becca_entities_bnote.js.html | 24 +- .../becca_entities_brevision.js.html | 62 ++ .../services_backend_script_api.js.html | 15 + src/services/backend_script_api.js | 15 + src/services/sync_mutex.js | 2 +- 17 files changed, 1415 insertions(+), 460 deletions(-) diff --git a/docs/backend_api/AbstractBeccaEntity.html b/docs/backend_api/AbstractBeccaEntity.html index 739d9d2cae..bc506e960f 100644 --- a/docs/backend_api/AbstractBeccaEntity.html +++ b/docs/backend_api/AbstractBeccaEntity.html @@ -183,7 +183,7 @@ <h4 class="name" id="becca"><span class="type-signature">(protected) </span>becc <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line55">line 55</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line35">line 35</a> </li></ul></dd> @@ -259,7 +259,7 @@ <h4 class="name" id="_getContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line246">line 246</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line250">line 250</a> </li></ul></dd> @@ -364,7 +364,7 @@ <h4 class="name" id="_setContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line124">line 124</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line128">line 128</a> </li></ul></dd> @@ -484,7 +484,7 @@ <h4 class="name" id="beforeSaving"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"> → {string}</span></h4> @@ -532,7 +532,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line32">line 32</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line59">line 59</a> </li></ul></dd> @@ -557,6 +557,24 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">string</span> + + + </dd> +</dl> + + @@ -568,7 +586,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protected) </span>generateIdIfNecessary<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="getPojo"><span class="type-signature">(abstract, protected) </span>getPojo<span class="signature">()</span><span class="type-signature"></span></h4> @@ -616,7 +634,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line25">line 25</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line82">line 82</a> </li></ul></dd> @@ -700,7 +718,7 @@ <h4 class="name" id="getPojoToSave"><span class="type-signature">(protected) </s <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line76">line 76</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line74">line 74</a> </li></ul></dd> @@ -784,7 +802,7 @@ <h4 class="name" id="getUtcDateChanged"><span class="type-signature">(protected) <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line47">line 47</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line27">line 27</a> </li></ul></dd> @@ -938,7 +956,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line263">line 263</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line267">line 267</a> </li></ul></dd> @@ -1022,7 +1040,7 @@ <h4 class="name" id="putEntityChange"><span class="type-signature">(protected) < <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line64">line 64</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line44">line 44</a> </li></ul></dd> @@ -1110,7 +1128,7 @@ <h4 class="name" id="save"><span class="type-signature"></span>save<span class=" <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line85">line 85</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line91">line 91</a> </li></ul></dd> diff --git a/docs/backend_api/BAttachment.html b/docs/backend_api/BAttachment.html index 50e40c1e3b..6682f46fde 100644 --- a/docs/backend_api/BAttachment.html +++ b/docs/backend_api/BAttachment.html @@ -205,7 +205,7 @@ <h5>Type:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line40">line 40</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line39">line 39</a> </li></ul></dd> @@ -268,7 +268,7 @@ <h4 class="name" id="becca"><span class="type-signature">(protected) </span>becc <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line55">line 55</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line35">line 35</a> </li></ul></dd> @@ -336,7 +336,7 @@ <h5>Type:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line52">line 52</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line51">line 51</a> </li></ul></dd> @@ -408,7 +408,7 @@ <h5>Type:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line63">line 63</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line62">line 62</a> </li></ul></dd> @@ -476,7 +476,7 @@ <h5>Type:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line56">line 56</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line55">line 55</a> </li></ul></dd> @@ -544,7 +544,7 @@ <h5>Type:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line54">line 54</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line53">line 53</a> </li></ul></dd> @@ -612,7 +612,7 @@ <h5>Type:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line46">line 46</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line45">line 45</a> </li></ul></dd> @@ -684,7 +684,7 @@ <h5>Type:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line42">line 42</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line41">line 41</a> </li></ul></dd> @@ -752,7 +752,7 @@ <h5>Type:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line50">line 50</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line49">line 49</a> </li></ul></dd> @@ -820,7 +820,7 @@ <h5>Type:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line44">line 44</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line43">line 43</a> </li></ul></dd> @@ -888,7 +888,7 @@ <h5>Type:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line48">line 48</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line47">line 47</a> </li></ul></dd> @@ -956,7 +956,7 @@ <h5>Type:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line58">line 58</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line57">line 57</a> </li></ul></dd> @@ -1024,7 +1024,7 @@ <h5>Type:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line60">line 60</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line59">line 59</a> </li></ul></dd> @@ -1105,7 +1105,7 @@ <h4 class="name" id="_getContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line246">line 246</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line250">line 250</a> </li></ul></dd> @@ -1215,7 +1215,7 @@ <h4 class="name" id="_setContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line124">line 124</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line128">line 128</a> </li></ul></dd> @@ -1388,7 +1388,7 @@ <h4 class="name" id="convertToNote"><span class="type-signature"></span>convertT <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line133">line 133</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line132">line 132</a> </li></ul></dd> @@ -1490,7 +1490,7 @@ <h4 class="name" id="copy"><span class="type-signature"></span>copy<span class=" <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line69">line 69</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line68">line 68</a> </li></ul></dd> @@ -1544,7 +1544,7 @@ <h5>Returns:</h5> - <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"> → {string}</span></h4> @@ -1597,7 +1597,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line32">line 32</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line59">line 59</a> </li></ul></dd> @@ -1622,6 +1622,24 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">string</span> + + + </dd> +</dl> + + @@ -1633,7 +1651,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protected) </span>generateIdIfNecessary<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="getContent"><span class="type-signature"></span>getContent<span class="signature">()</span><span class="type-signature"> → {string|Buffer}</span></h4> @@ -1661,11 +1679,6 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec - <dt class="tag-overrides">Overrides:</dt> - <dd class="tag-overrides"><ul class="dummy"><li> - <a href="AbstractBeccaEntity.html#generateIdIfNecessary">AbstractBeccaEntity#generateIdIfNecessary</a> - </li></ul></dd> - @@ -1686,7 +1699,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line25">line 25</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line117">line 117</a> </li></ul></dd> @@ -1711,6 +1724,27 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">string</span> +| + +<span class="param-type">Buffer</span> + + + </dd> +</dl> + + @@ -1722,7 +1756,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec - <h4 class="name" id="getContent"><span class="type-signature"></span>getContent<span class="signature">()</span><span class="type-signature"> → {string|Buffer}</span></h4> + <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span class="signature">()</span><span class="type-signature"> → {<a href="BNote.html">BNote</a>}</span></h4> @@ -1770,7 +1804,7 @@ <h4 class="name" id="getContent"><span class="type-signature"></span>getContent< <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line118">line 118</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line80">line 80</a> </li></ul></dd> @@ -1806,10 +1840,7 @@ <h5>Returns:</h5> </dt> <dd> -<span class="param-type">string</span> -| - -<span class="param-type">Buffer</span> +<span class="param-type"><a href="BNote.html">BNote</a></span> </dd> @@ -1827,7 +1858,7 @@ <h5>Returns:</h5> - <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span class="signature">()</span><span class="type-signature"> → {<a href="BNote.html">BNote</a>}</span></h4> + <h4 class="name" id="getPojo"><span class="type-signature">(abstract, protected) </span>getPojo<span class="signature">()</span><span class="type-signature"></span></h4> @@ -1855,6 +1886,11 @@ <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span c + <dt class="tag-overrides">Overrides:</dt> + <dd class="tag-overrides"><ul class="dummy"><li> + <a href="AbstractBeccaEntity.html#getPojo">AbstractBeccaEntity#getPojo</a> + </li></ul></dd> + @@ -1875,7 +1911,7 @@ <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span c <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line81">line 81</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line82">line 82</a> </li></ul></dd> @@ -1900,24 +1936,6 @@ <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span c -<h5>Returns:</h5> - - - - -<dl> - <dt> - Type - </dt> - <dd> - -<span class="param-type"><a href="BNote.html">BNote</a></span> - - - </dd> -</dl> - - @@ -1982,7 +2000,7 @@ <h4 class="name" id="getPojoToSave"><span class="type-signature">(protected) </s <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line76">line 76</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line74">line 74</a> </li></ul></dd> @@ -2071,7 +2089,7 @@ <h4 class="name" id="getUtcDateChanged"><span class="type-signature">(protected) <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line47">line 47</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line27">line 27</a> </li></ul></dd> @@ -2155,7 +2173,7 @@ <h4 class="name" id="hasStringContent"><span class="type-signature"></span>hasSt <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line86">line 86</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line85">line 85</a> </li></ul></dd> @@ -2336,7 +2354,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line263">line 263</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line267">line 267</a> </li></ul></dd> @@ -2425,7 +2443,7 @@ <h4 class="name" id="putEntityChange"><span class="type-signature">(protected) < <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line64">line 64</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line44">line 44</a> </li></ul></dd> @@ -2518,7 +2536,7 @@ <h4 class="name" id="save"><span class="type-signature"></span>save<span class=" <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line85">line 85</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line91">line 91</a> </li></ul></dd> @@ -2815,7 +2833,7 @@ <h6>Properties</h6> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line128">line 128</a> + <a href="becca_entities_battachment.js.html">becca/entities/battachment.js</a>, <a href="becca_entities_battachment.js.html#line127">line 127</a> </li></ul></dd> diff --git a/docs/backend_api/BAttribute.html b/docs/backend_api/BAttribute.html index cc20d0db8b..30096176e4 100644 --- a/docs/backend_api/BAttribute.html +++ b/docs/backend_api/BAttribute.html @@ -268,7 +268,7 @@ <h4 class="name" id="becca"><span class="type-signature">(protected) </span>becc <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line55">line 55</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line35">line 35</a> </li></ul></dd> @@ -825,7 +825,7 @@ <h4 class="name" id="_getContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line246">line 246</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line250">line 250</a> </li></ul></dd> @@ -935,7 +935,7 @@ <h4 class="name" id="_setContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line124">line 124</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line128">line 128</a> </li></ul></dd> @@ -1060,7 +1060,7 @@ <h4 class="name" id="beforeSaving"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"> → {string}</span></h4> @@ -1113,7 +1113,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line32">line 32</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line59">line 59</a> </li></ul></dd> @@ -1138,6 +1138,24 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">string</span> + + + </dd> +</dl> + + @@ -1149,7 +1167,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protected) </span>generateIdIfNecessary<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span class="signature">()</span><span class="type-signature"> → {<a href="BNote.html">BNote</a>|null}</span></h4> @@ -1177,11 +1195,6 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec - <dt class="tag-overrides">Overrides:</dt> - <dd class="tag-overrides"><ul class="dummy"><li> - <a href="AbstractBeccaEntity.html#generateIdIfNecessary">AbstractBeccaEntity#generateIdIfNecessary</a> - </li></ul></dd> - @@ -1202,7 +1215,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line25">line 25</a> + <a href="becca_entities_battribute.js.html">becca/entities/battribute.js</a>, <a href="becca_entities_battribute.js.html#line129">line 129</a> </li></ul></dd> @@ -1227,6 +1240,27 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type"><a href="BNote.html">BNote</a></span> +| + +<span class="param-type">null</span> + + + </dd> +</dl> + + @@ -1238,7 +1272,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec - <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span class="signature">()</span><span class="type-signature"> → {<a href="BNote.html">BNote</a>|null}</span></h4> + <h4 class="name" id="getPojo"><span class="type-signature">(abstract, protected) </span>getPojo<span class="signature">()</span><span class="type-signature"></span></h4> @@ -1266,6 +1300,11 @@ <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span c + <dt class="tag-overrides">Overrides:</dt> + <dd class="tag-overrides"><ul class="dummy"><li> + <a href="AbstractBeccaEntity.html#getPojo">AbstractBeccaEntity#getPojo</a> + </li></ul></dd> + @@ -1286,7 +1325,7 @@ <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span c <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_battribute.js.html">becca/entities/battribute.js</a>, <a href="becca_entities_battribute.js.html#line129">line 129</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line82">line 82</a> </li></ul></dd> @@ -1311,27 +1350,6 @@ <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span c -<h5>Returns:</h5> - - - - -<dl> - <dt> - Type - </dt> - <dd> - -<span class="param-type"><a href="BNote.html">BNote</a></span> -| - -<span class="param-type">null</span> - - - </dd> -</dl> - - @@ -1396,7 +1414,7 @@ <h4 class="name" id="getPojoToSave"><span class="type-signature">(protected) </s <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line76">line 76</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line74">line 74</a> </li></ul></dd> @@ -1590,7 +1608,7 @@ <h4 class="name" id="getUtcDateChanged"><span class="type-signature">(protected) <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line47">line 47</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line27">line 27</a> </li></ul></dd> @@ -1851,7 +1869,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line263">line 263</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line267">line 267</a> </li></ul></dd> @@ -1940,7 +1958,7 @@ <h4 class="name" id="putEntityChange"><span class="type-signature">(protected) < <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line64">line 64</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line44">line 44</a> </li></ul></dd> @@ -2033,7 +2051,7 @@ <h4 class="name" id="save"><span class="type-signature"></span>save<span class=" <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line85">line 85</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line91">line 91</a> </li></ul></dd> diff --git a/docs/backend_api/BBranch.html b/docs/backend_api/BBranch.html index 4e716ec2e1..eee682cca1 100644 --- a/docs/backend_api/BBranch.html +++ b/docs/backend_api/BBranch.html @@ -203,7 +203,7 @@ <h4 class="name" id="becca"><span class="type-signature">(protected) </span>becc <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line55">line 55</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line35">line 35</a> </li></ul></dd> @@ -945,7 +945,7 @@ <h4 class="name" id="_getContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line246">line 246</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line250">line 250</a> </li></ul></dd> @@ -1055,7 +1055,7 @@ <h4 class="name" id="_setContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line124">line 124</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line128">line 128</a> </li></ul></dd> @@ -1384,7 +1384,7 @@ <h5>Returns:</h5> - <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"> → {string}</span></h4> @@ -1437,7 +1437,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line32">line 32</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line59">line 59</a> </li></ul></dd> @@ -1462,6 +1462,24 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">string</span> + + + </dd> +</dl> + + @@ -1473,7 +1491,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protected) </span>generateIdIfNecessary<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span class="signature">()</span><span class="type-signature"> → {<a href="BNote.html">BNote</a>}</span></h4> @@ -1501,11 +1519,6 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec - <dt class="tag-overrides">Overrides:</dt> - <dd class="tag-overrides"><ul class="dummy"><li> - <a href="AbstractBeccaEntity.html#generateIdIfNecessary">AbstractBeccaEntity#generateIdIfNecessary</a> - </li></ul></dd> - @@ -1526,7 +1539,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line25">line 25</a> + <a href="becca_entities_bbranch.js.html">becca/entities/bbranch.js</a>, <a href="becca_entities_bbranch.js.html#line107">line 107</a> </li></ul></dd> @@ -1551,6 +1564,24 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type"><a href="BNote.html">BNote</a></span> + + + </dd> +</dl> + + @@ -1562,7 +1593,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec - <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span class="signature">()</span><span class="type-signature"> → {<a href="BNote.html">BNote</a>}</span></h4> + <h4 class="name" id="getPojo"><span class="type-signature">(abstract, protected) </span>getPojo<span class="signature">()</span><span class="type-signature"></span></h4> @@ -1590,6 +1621,11 @@ <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span c + <dt class="tag-overrides">Overrides:</dt> + <dd class="tag-overrides"><ul class="dummy"><li> + <a href="AbstractBeccaEntity.html#getPojo">AbstractBeccaEntity#getPojo</a> + </li></ul></dd> + @@ -1610,7 +1646,7 @@ <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span c <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bbranch.js.html">becca/entities/bbranch.js</a>, <a href="becca_entities_bbranch.js.html#line107">line 107</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line82">line 82</a> </li></ul></dd> @@ -1635,24 +1671,6 @@ <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span c -<h5>Returns:</h5> - - - - -<dl> - <dt> - Type - </dt> - <dd> - -<span class="param-type"><a href="BNote.html">BNote</a></span> - - - </dd> -</dl> - - @@ -1717,7 +1735,7 @@ <h4 class="name" id="getPojoToSave"><span class="type-signature">(protected) </s <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line76">line 76</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line74">line 74</a> </li></ul></dd> @@ -1806,7 +1824,7 @@ <h4 class="name" id="getUtcDateChanged"><span class="type-signature">(protected) <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line47">line 47</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line27">line 27</a> </li></ul></dd> @@ -1965,7 +1983,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line263">line 263</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line267">line 267</a> </li></ul></dd> @@ -2054,7 +2072,7 @@ <h4 class="name" id="putEntityChange"><span class="type-signature">(protected) < <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line64">line 64</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line44">line 44</a> </li></ul></dd> @@ -2147,7 +2165,7 @@ <h4 class="name" id="save"><span class="type-signature"></span>save<span class=" <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line85">line 85</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line91">line 91</a> </li></ul></dd> diff --git a/docs/backend_api/BEtapiToken.html b/docs/backend_api/BEtapiToken.html index 6fce5b28ad..8544211574 100644 --- a/docs/backend_api/BEtapiToken.html +++ b/docs/backend_api/BEtapiToken.html @@ -205,7 +205,7 @@ <h4 class="name" id="becca"><span class="type-signature">(protected) </span>becc <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line55">line 55</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line35">line 35</a> </li></ul></dd> @@ -694,7 +694,7 @@ <h4 class="name" id="_getContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line246">line 246</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line250">line 250</a> </li></ul></dd> @@ -804,7 +804,7 @@ <h4 class="name" id="_setContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line124">line 124</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line128">line 128</a> </li></ul></dd> @@ -929,7 +929,7 @@ <h4 class="name" id="beforeSaving"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"> → {string}</span></h4> @@ -982,7 +982,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line32">line 32</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line59">line 59</a> </li></ul></dd> @@ -1007,6 +1007,24 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">string</span> + + + </dd> +</dl> + + @@ -1018,7 +1036,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protected) </span>generateIdIfNecessary<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="getPojo"><span class="type-signature">(abstract, protected) </span>getPojo<span class="signature">()</span><span class="type-signature"></span></h4> @@ -1048,7 +1066,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec <dt class="tag-overrides">Overrides:</dt> <dd class="tag-overrides"><ul class="dummy"><li> - <a href="AbstractBeccaEntity.html#generateIdIfNecessary">AbstractBeccaEntity#generateIdIfNecessary</a> + <a href="AbstractBeccaEntity.html#getPojo">AbstractBeccaEntity#getPojo</a> </li></ul></dd> @@ -1071,7 +1089,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line25">line 25</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line82">line 82</a> </li></ul></dd> @@ -1160,7 +1178,7 @@ <h4 class="name" id="getPojoToSave"><span class="type-signature">(protected) </s <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line76">line 76</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line74">line 74</a> </li></ul></dd> @@ -1249,7 +1267,7 @@ <h4 class="name" id="getUtcDateChanged"><span class="type-signature">(protected) <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line47">line 47</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line27">line 27</a> </li></ul></dd> @@ -1408,7 +1426,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line263">line 263</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line267">line 267</a> </li></ul></dd> @@ -1497,7 +1515,7 @@ <h4 class="name" id="putEntityChange"><span class="type-signature">(protected) < <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line64">line 64</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line44">line 44</a> </li></ul></dd> @@ -1590,7 +1608,7 @@ <h4 class="name" id="save"><span class="type-signature"></span>save<span class=" <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line85">line 85</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line91">line 91</a> </li></ul></dd> diff --git a/docs/backend_api/BNote.html b/docs/backend_api/BNote.html index f77a085e5d..5fe97e3d17 100644 --- a/docs/backend_api/BNote.html +++ b/docs/backend_api/BNote.html @@ -270,7 +270,7 @@ <h4 class="name" id="becca"><span class="type-signature">(protected) </span>becc <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line55">line 55</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line35">line 35</a> </li></ul></dd> @@ -1171,7 +1171,7 @@ <h4 class="name" id="_getContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line246">line 246</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line250">line 250</a> </li></ul></dd> @@ -1281,7 +1281,7 @@ <h4 class="name" id="_setContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line124">line 124</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line128">line 128</a> </li></ul></dd> @@ -1588,7 +1588,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1327">line 1327</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1333">line 1333</a> </li></ul></dd> @@ -1835,7 +1835,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1348">line 1348</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1354">line 1354</a> </li></ul></dd> @@ -2081,7 +2081,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1361">line 1361</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1367">line 1367</a> </li></ul></dd> @@ -2316,7 +2316,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1446">line 1446</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1452">line 1452</a> </li></ul></dd> @@ -2432,7 +2432,7 @@ <h4 class="name" id="convertToParentAttachment"><span class="type-signature"></s <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1498">line 1498</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1504">line 1504</a> </li></ul></dd> @@ -2653,7 +2653,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1536">line 1536</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1542">line 1542</a> </li></ul></dd> @@ -2689,7 +2689,7 @@ <h5>Parameters:</h5> - <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"> → {string}</span></h4> @@ -2742,7 +2742,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line32">line 32</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line59">line 59</a> </li></ul></dd> @@ -2767,95 +2767,24 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp - - - - +<h5>Returns:</h5> - - - - - - <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protected) </span>generateIdIfNecessary<span class="signature">()</span><span class="type-signature"></span></h4> - - - - - - - - - - - - - - - - - - -<dl class="details"> - - - - - - - - - <dt class="tag-overrides">Overrides:</dt> - <dd class="tag-overrides"><ul class="dummy"><li> - <a href="AbstractBeccaEntity.html#generateIdIfNecessary">AbstractBeccaEntity#generateIdIfNecessary</a> - </li></ul></dd> - - - - - - - - - - - - - - - - - - <dt class="tag-source">Source:</dt> - <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line25">line 25</a> - </li></ul></dd> - - - +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">string</span> - - + </dd> </dl> - - - - - - - - - - - - - - + @@ -2919,7 +2848,7 @@ <h4 class="name" id="getAllNotePaths"><span class="type-signature"></span>getAll <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1168">line 1168</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1174">line 1174</a> </li></ul></dd> @@ -3025,7 +2954,7 @@ <h4 class="name" id="getAncestorNoteIds"><span class="type-signature"></span>get <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1044">line 1044</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1050">line 1050</a> </li></ul></dd> @@ -3127,7 +3056,7 @@ <h4 class="name" id="getAncestors"><span class="type-signature"></span>getAncest <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1018">line 1018</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1024">line 1024</a> </li></ul></dd> @@ -3229,7 +3158,7 @@ <h4 class="name" id="getAttachmentById"><span class="type-signature"></span>getA <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1125">line 1125</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1131">line 1131</a> </li></ul></dd> @@ -3334,7 +3263,7 @@ <h4 class="name" id="getAttachmentByTitle"><span class="type-signature"></span>g <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1152">line 1152</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1158">line 1158</a> </li></ul></dd> @@ -3436,7 +3365,7 @@ <h4 class="name" id="getAttachments"><span class="type-signature"></span>getAtta <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1107">line 1107</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1113">line 1113</a> </li></ul></dd> @@ -3538,7 +3467,7 @@ <h4 class="name" id="getAttachmentsByRole"><span class="type-signature"></span>g <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1140">line 1140</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1146">line 1146</a> </li></ul></dd> @@ -3712,7 +3641,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line581">line 581</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line587">line 587</a> </li></ul></dd> @@ -3891,7 +3820,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line592">line 592</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line598">line 598</a> </li></ul></dd> @@ -4099,7 +4028,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line334">line 334</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line340">line 340</a> </li></ul></dd> @@ -4278,7 +4207,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1221">line 1221</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1227">line 1227</a> </li></ul></dd> @@ -4457,7 +4386,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1231">line 1231</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1237">line 1237</a> </li></ul></dd> @@ -4565,7 +4494,7 @@ <h4 class="name" id="getBranches"><span class="type-signature"></span>getBranche <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line176">line 176</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line182">line 182</a> </li></ul></dd> @@ -4667,7 +4596,7 @@ <h4 class="name" id="getChildBranches"><span class="type-signature"></span>getCh <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line196">line 196</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line202">line 202</a> </li></ul></dd> @@ -4769,7 +4698,7 @@ <h4 class="name" id="getChildNotes"><span class="type-signature"></span>getChild <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line186">line 186</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line192">line 192</a> </li></ul></dd> @@ -4871,7 +4800,7 @@ <h4 class="name" id="getContent"><span class="type-signature"></span>getContent< <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line210">line 210</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line216">line 216</a> </li></ul></dd> @@ -4978,7 +4907,7 @@ <h4 class="name" id="getDescendantNoteIds"><span class="type-signature"></span>g <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line965">line 965</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line971">line 971</a> </li></ul></dd> @@ -5068,7 +4997,7 @@ <h4 class="name" id="getFlatText"><span class="type-signature"></span>getFlatTex <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line766">line 766</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line772">line 772</a> </li></ul></dd> @@ -5174,7 +5103,7 @@ <h4 class="name" id="getInheritingNotes"><span class="type-signature"></span>get <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1070">line 1070</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1076">line 1076</a> </li></ul></dd> @@ -5281,7 +5210,7 @@ <h4 class="name" id="getJsonContent"><span class="type-signature"></span>getJson <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line217">line 217</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line223">line 223</a> </li></ul></dd> @@ -5395,7 +5324,7 @@ <h4 class="name" id="getJsonContentSafely"><span class="type-signature"></span>g <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line228">line 228</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line234">line 234</a> </li></ul></dd> @@ -5553,7 +5482,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line521">line 521</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line527">line 527</a> </li></ul></dd> @@ -5711,7 +5640,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line545">line 545</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line551">line 551</a> </li></ul></dd> @@ -5881,7 +5810,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line621">line 621</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line627">line 627</a> </li></ul></dd> @@ -6048,7 +5977,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line613">line 613</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line619">line 619</a> </li></ul></dd> @@ -6154,7 +6083,7 @@ <h4 class="name" id="getOwnedAttribute"><span class="type-signature"></span>getO <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line691">line 691</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line697">line 697</a> </li></ul></dd> @@ -6334,7 +6263,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line603">line 603</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line609">line 609</a> </li></ul></dd> @@ -6604,7 +6533,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line666">line 666</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line672">line 672</a> </li></ul></dd> @@ -6759,7 +6688,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line527">line 527</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line533">line 533</a> </li></ul></dd> @@ -6917,7 +6846,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line551">line 551</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line557">line 557</a> </li></ul></dd> @@ -7087,7 +7016,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line637">line 637</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line643">line 643</a> </li></ul></dd> @@ -7254,7 +7183,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line629">line 629</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line635">line 635</a> </li></ul></dd> @@ -7409,7 +7338,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line539">line 539</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line545">line 545</a> </li></ul></dd> @@ -7567,7 +7496,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line563">line 563</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line569">line 569</a> </li></ul></dd> @@ -7737,7 +7666,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line653">line 653</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line659">line 659</a> </li></ul></dd> @@ -7843,7 +7772,7 @@ <h4 class="name" id="getParentBranches"><span class="type-signature"></span>getP <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line159">line 159</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line165">line 165</a> </li></ul></dd> @@ -7945,7 +7874,7 @@ <h4 class="name" id="getParentNotes"><span class="type-signature"></span>getPare <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line181">line 181</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line187">line 187</a> </li></ul></dd> @@ -7993,6 +7922,95 @@ <h5>Returns:</h5> + + + + + + + <h4 class="name" id="getPojo"><span class="type-signature">(abstract, protected) </span>getPojo<span class="signature">()</span><span class="type-signature"></span></h4> + + + + + + + + + + + + + + + + + + +<dl class="details"> + + + + + + + + + <dt class="tag-overrides">Overrides:</dt> + <dd class="tag-overrides"><ul class="dummy"><li> + <a href="AbstractBeccaEntity.html#getPojo">AbstractBeccaEntity#getPojo</a> + </li></ul></dd> + + + + + + + + + + + + + + + + + + + + <dt class="tag-source">Source:</dt> + <dd class="tag-source"><ul class="dummy"><li> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line82">line 82</a> + </li></ul></dd> + + + + + + + +</dl> + + + + + + + + + + + + + + + + + + + + @@ -8052,7 +8070,7 @@ <h4 class="name" id="getPojoToSave"><span class="type-signature">(protected) </s <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line76">line 76</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line74">line 74</a> </li></ul></dd> @@ -8185,7 +8203,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line533">line 533</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line539">line 539</a> </li></ul></dd> @@ -8343,7 +8361,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line557">line 557</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line563">line 563</a> </li></ul></dd> @@ -8513,7 +8531,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line645">line 645</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line651">line 651</a> </li></ul></dd> @@ -8619,7 +8637,7 @@ <h4 class="name" id="getRevisions"><span class="type-signature"></span>getRevisi <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1101">line 1101</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1107">line 1107</a> </li></ul></dd> @@ -8721,7 +8739,7 @@ <h4 class="name" id="getScriptEnv"><span class="type-signature"></span>getScript <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line310">line 310</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line316">line 316</a> </li></ul></dd> @@ -8830,7 +8848,7 @@ <h4 class="name" id="getSearchResultNotes"><span class="type-signature"></span>g <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line876">line 876</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line882">line 882</a> </li></ul></dd> @@ -9001,7 +9019,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1190">line 1190</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1196">line 1196</a> </li></ul></dd> @@ -9107,7 +9125,7 @@ <h4 class="name" id="getStrongParentBranches"><span class="type-signature"></spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line168">line 168</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line174">line 174</a> </li></ul></dd> @@ -9209,7 +9227,7 @@ <h4 class="name" id="getSubtree"><span class="type-signature"></span>getSubtree< <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line899">line 899</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line905">line 905</a> </li></ul></dd> @@ -9311,7 +9329,7 @@ <h4 class="name" id="getSubtreeNoteIds"><span class="type-signature"></span>getS <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line958">line 958</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line964">line 964</a> </li></ul></dd> @@ -9417,7 +9435,7 @@ <h4 class="name" id="getSubtreeNotesIncludingTemplated"><span class="type-signat <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line844">line 844</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line850">line 850</a> </li></ul></dd> @@ -9519,7 +9537,7 @@ <h4 class="name" id="getTargetRelations"><span class="type-signature"></span>get <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1064">line 1064</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1070">line 1070</a> </li></ul></dd> @@ -9626,7 +9644,7 @@ <h4 class="name" id="getUtcDateChanged"><span class="type-signature">(protected) <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line47">line 47</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line27">line 27</a> </li></ul></dd> @@ -9710,7 +9728,7 @@ <h4 class="name" id="hasAncestor"><span class="type-signature"></span>hasAncesto <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1049">line 1049</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1055">line 1055</a> </li></ul></dd> @@ -9936,7 +9954,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line451">line 451</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line457">line 457</a> </li></ul></dd> @@ -10038,7 +10056,7 @@ <h4 class="name" id="hasChildren"><span class="type-signature"></span>hasChildre <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line191">line 191</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line197">line 197</a> </li></ul></dd> @@ -10232,7 +10250,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line480">line 480</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line486">line 486</a> </li></ul></dd> @@ -10461,7 +10479,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line571">line 571</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line577">line 577</a> </li></ul></dd> @@ -10659,7 +10677,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line501">line 501</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line507">line 507</a> </li></ul></dd> @@ -10857,7 +10875,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line515">line 515</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line521">line 521</a> </li></ul></dd> @@ -11055,7 +11073,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line508">line 508</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line514">line 514</a> </li></ul></dd> @@ -11161,7 +11179,7 @@ <h4 class="name" id="hasStringContent"><span class="type-signature"></span>hasSt <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line305">line 305</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line311">line 311</a> </li></ul></dd> @@ -11311,7 +11329,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1262">line 1262</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1268">line 1268</a> </li></ul></dd> @@ -11417,7 +11435,7 @@ <h4 class="name" id="isHiddenCompletely"><span class="type-signature"></span>isH <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1240">line 1240</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1246">line 1246</a> </li></ul></dd> @@ -11511,7 +11529,7 @@ <h4 class="name" id="isHtml"><span class="type-signature"></span>isHtml<span cla <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line288">line 288</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line294">line 294</a> </li></ul></dd> @@ -11617,7 +11635,7 @@ <h4 class="name" id="isImage"><span class="type-signature"></span>isImage<span c <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line294">line 294</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line300">line 300</a> </li></ul></dd> @@ -11723,7 +11741,7 @@ <h4 class="name" id="isJavaScript"><span class="type-signature"></span>isJavaScr <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line280">line 280</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line286">line 286</a> </li></ul></dd> @@ -11829,7 +11847,7 @@ <h4 class="name" id="isJson"><span class="type-signature"></span>isJson<span cla <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line275">line 275</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line281">line 281</a> </li></ul></dd> @@ -11984,7 +12002,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line486">line 486</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line492">line 492</a> </li></ul></dd> @@ -12090,7 +12108,7 @@ <h4 class="name" id="isRoot"><span class="type-signature"></span>isRoot<span cla <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line270">line 270</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line276">line 276</a> </li></ul></dd> @@ -12198,7 +12216,7 @@ <h4 class="name" id="isStringNote"><span class="type-signature"></span>isStringN <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line300">line 300</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line306">line 306</a> </li></ul></dd> @@ -12357,7 +12375,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line263">line 263</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line267">line 267</a> </li></ul></dd> @@ -12446,7 +12464,7 @@ <h4 class="name" id="putEntityChange"><span class="type-signature">(protected) < <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line64">line 64</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line44">line 44</a> </li></ul></dd> @@ -12657,7 +12675,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1306">line 1306</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1312">line 1312</a> </li></ul></dd> @@ -12837,7 +12855,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1422">line 1422</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1428">line 1428</a> </li></ul></dd> @@ -13017,7 +13035,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1430">line 1430</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1436">line 1436</a> </li></ul></dd> @@ -13110,7 +13128,7 @@ <h4 class="name" id="save"><span class="type-signature"></span>save<span class=" <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line85">line 85</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line91">line 91</a> </li></ul></dd> @@ -13212,7 +13230,7 @@ <h4 class="name" id="saveAttachment"><span class="type-signature"></span>saveAtt <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1638">line 1638</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1640">line 1640</a> </li></ul></dd> @@ -13314,7 +13332,7 @@ <h4 class="name" id="saveRevision"><span class="type-signature"></span>saveRevis <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1590">line 1590</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1596">line 1596</a> </li></ul></dd> @@ -13546,7 +13564,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1275">line 1275</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1281">line 1281</a> </li></ul></dd> @@ -13825,7 +13843,7 @@ <h6>Properties</h6> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line243">line 243</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line249">line 249</a> </li></ul></dd> @@ -14005,7 +14023,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1406">line 1406</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1412">line 1412</a> </li></ul></dd> @@ -14165,7 +14183,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1414">line 1414</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1420">line 1420</a> </li></ul></dd> @@ -14407,7 +14425,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1373">line 1373</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1379">line 1379</a> </li></ul></dd> @@ -14618,7 +14636,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1389">line 1389</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1395">line 1395</a> </li></ul></dd> @@ -14829,7 +14847,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1398">line 1398</a> + <a href="becca_entities_bnote.js.html">becca/entities/bnote.js</a>, <a href="becca_entities_bnote.js.html#line1404">line 1404</a> </li></ul></dd> diff --git a/docs/backend_api/BOption.html b/docs/backend_api/BOption.html index 11696ebaf7..d07862070f 100644 --- a/docs/backend_api/BOption.html +++ b/docs/backend_api/BOption.html @@ -199,7 +199,7 @@ <h4 class="name" id="becca"><span class="type-signature">(protected) </span>becc <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line55">line 55</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line35">line 35</a> </li></ul></dd> @@ -552,7 +552,7 @@ <h4 class="name" id="_getContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line246">line 246</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line250">line 250</a> </li></ul></dd> @@ -662,7 +662,7 @@ <h4 class="name" id="_setContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line124">line 124</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line128">line 128</a> </li></ul></dd> @@ -787,7 +787,7 @@ <h4 class="name" id="beforeSaving"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"> → {string}</span></h4> @@ -840,7 +840,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line32">line 32</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line59">line 59</a> </li></ul></dd> @@ -865,6 +865,24 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">string</span> + + + </dd> +</dl> + + @@ -876,7 +894,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protected) </span>generateIdIfNecessary<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="getPojo"><span class="type-signature">(abstract, protected) </span>getPojo<span class="signature">()</span><span class="type-signature"></span></h4> @@ -906,7 +924,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec <dt class="tag-overrides">Overrides:</dt> <dd class="tag-overrides"><ul class="dummy"><li> - <a href="AbstractBeccaEntity.html#generateIdIfNecessary">AbstractBeccaEntity#generateIdIfNecessary</a> + <a href="AbstractBeccaEntity.html#getPojo">AbstractBeccaEntity#getPojo</a> </li></ul></dd> @@ -929,7 +947,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line25">line 25</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line82">line 82</a> </li></ul></dd> @@ -1018,7 +1036,7 @@ <h4 class="name" id="getPojoToSave"><span class="type-signature">(protected) </s <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line76">line 76</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line74">line 74</a> </li></ul></dd> @@ -1107,7 +1125,7 @@ <h4 class="name" id="getUtcDateChanged"><span class="type-signature">(protected) <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line47">line 47</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line27">line 27</a> </li></ul></dd> @@ -1266,7 +1284,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line263">line 263</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line267">line 267</a> </li></ul></dd> @@ -1355,7 +1373,7 @@ <h4 class="name" id="putEntityChange"><span class="type-signature">(protected) < <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line64">line 64</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line44">line 44</a> </li></ul></dd> @@ -1448,7 +1466,7 @@ <h4 class="name" id="save"><span class="type-signature"></span>save<span class=" <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line85">line 85</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line91">line 91</a> </li></ul></dd> diff --git a/docs/backend_api/BRecentNote.html b/docs/backend_api/BRecentNote.html index d339e46579..927364aeed 100644 --- a/docs/backend_api/BRecentNote.html +++ b/docs/backend_api/BRecentNote.html @@ -199,7 +199,7 @@ <h4 class="name" id="becca"><span class="type-signature">(protected) </span>becc <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line55">line 55</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line35">line 35</a> </li></ul></dd> @@ -484,7 +484,7 @@ <h4 class="name" id="_getContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line246">line 246</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line250">line 250</a> </li></ul></dd> @@ -594,7 +594,7 @@ <h4 class="name" id="_setContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line124">line 124</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line128">line 128</a> </li></ul></dd> @@ -719,7 +719,7 @@ <h4 class="name" id="beforeSaving"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"> → {string}</span></h4> @@ -772,7 +772,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line32">line 32</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line59">line 59</a> </li></ul></dd> @@ -797,6 +797,24 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">string</span> + + + </dd> +</dl> + + @@ -808,7 +826,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protected) </span>generateIdIfNecessary<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="getPojo"><span class="type-signature">(abstract, protected) </span>getPojo<span class="signature">()</span><span class="type-signature"></span></h4> @@ -838,7 +856,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec <dt class="tag-overrides">Overrides:</dt> <dd class="tag-overrides"><ul class="dummy"><li> - <a href="AbstractBeccaEntity.html#generateIdIfNecessary">AbstractBeccaEntity#generateIdIfNecessary</a> + <a href="AbstractBeccaEntity.html#getPojo">AbstractBeccaEntity#getPojo</a> </li></ul></dd> @@ -861,7 +879,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line25">line 25</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line82">line 82</a> </li></ul></dd> @@ -950,7 +968,7 @@ <h4 class="name" id="getPojoToSave"><span class="type-signature">(protected) </s <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line76">line 76</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line74">line 74</a> </li></ul></dd> @@ -1039,7 +1057,7 @@ <h4 class="name" id="getUtcDateChanged"><span class="type-signature">(protected) <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line47">line 47</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line27">line 27</a> </li></ul></dd> @@ -1198,7 +1216,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line263">line 263</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line267">line 267</a> </li></ul></dd> @@ -1287,7 +1305,7 @@ <h4 class="name" id="putEntityChange"><span class="type-signature">(protected) < <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line64">line 64</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line44">line 44</a> </li></ul></dd> @@ -1380,7 +1398,7 @@ <h4 class="name" id="save"><span class="type-signature"></span>save<span class=" <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line85">line 85</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line91">line 91</a> </li></ul></dd> diff --git a/docs/backend_api/BRevision.html b/docs/backend_api/BRevision.html index e97dc907cd..9353a04e83 100644 --- a/docs/backend_api/BRevision.html +++ b/docs/backend_api/BRevision.html @@ -200,7 +200,7 @@ <h4 class="name" id="becca"><span class="type-signature">(protected) </span>becc <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line55">line 55</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line35">line 35</a> </li></ul></dd> @@ -1165,7 +1165,7 @@ <h4 class="name" id="_getContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line246">line 246</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line250">line 250</a> </li></ul></dd> @@ -1275,7 +1275,7 @@ <h4 class="name" id="_setContent"><span class="type-signature">(protected) </spa <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line124">line 124</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line128">line 128</a> </li></ul></dd> @@ -1400,7 +1400,7 @@ <h4 class="name" id="beforeSaving"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="generateHash"><span class="type-signature">(protected) </span>generateHash<span class="signature">()</span><span class="type-signature"> → {string}</span></h4> @@ -1453,7 +1453,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line32">line 32</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line59">line 59</a> </li></ul></dd> @@ -1478,6 +1478,24 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">string</span> + + + </dd> +</dl> + + @@ -1489,7 +1507,7 @@ <h4 class="name" id="generateHash"><span class="type-signature">(protected) </sp - <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protected) </span>generateIdIfNecessary<span class="signature">()</span><span class="type-signature"></span></h4> + <h4 class="name" id="getAttachmentById"><span class="type-signature"></span>getAttachmentById<span class="signature">()</span><span class="type-signature"> → {<a href="BAttachment.html">BAttachment</a>|null}</span></h4> @@ -1517,9 +1535,27 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec - <dt class="tag-overrides">Overrides:</dt> - <dd class="tag-overrides"><ul class="dummy"><li> - <a href="AbstractBeccaEntity.html#generateIdIfNecessary">AbstractBeccaEntity#generateIdIfNecessary</a> + + + + + + + + + + + + + + + + + + + <dt class="tag-source">Source:</dt> + <dd class="tag-source"><ul class="dummy"><li> + <a href="becca_entities_brevision.js.html">becca/entities/brevision.js</a>, <a href="becca_entities_brevision.js.html#line132">line 132</a> </li></ul></dd> @@ -1528,6 +1564,88 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec +</dl> + + + + + + + + + + + + + + + +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type"><a href="BAttachment.html">BAttachment</a></span> +| + +<span class="param-type">null</span> + + + </dd> +</dl> + + + + + + + + + + + + + + <h4 class="name" id="getAttachmentByTitle"><span class="type-signature"></span>getAttachmentByTitle<span class="signature">()</span><span class="type-signature"> → {<a href="BAttachment.html">BAttachment</a>}</span></h4> + + + + + + + + + + + + + + + + + + +<dl class="details"> + + + + + + + + + + + + + + @@ -1542,7 +1660,7 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line25">line 25</a> + <a href="becca_entities_brevision.js.html">becca/entities/brevision.js</a>, <a href="becca_entities_brevision.js.html#line159">line 159</a> </li></ul></dd> @@ -1567,6 +1685,24 @@ <h4 class="name" id="generateIdIfNecessary"><span class="type-signature">(protec +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type"><a href="BAttachment.html">BAttachment</a></span> + + + </dd> +</dl> + + @@ -1626,7 +1762,109 @@ <h4 class="name" id="getAttachments"><span class="type-signature"></span>getAtta <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_brevision.js.html">becca/entities/brevision.js</a>, <a href="becca_entities_brevision.js.html#line99">line 99</a> + <a href="becca_entities_brevision.js.html">becca/entities/brevision.js</a>, <a href="becca_entities_brevision.js.html#line122">line 122</a> + </li></ul></dd> + + + + + + + +</dl> + + + + + + + + + + + + + + + +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">Array.<<a href="BAttachment.html">BAttachment</a>></span> + + + </dd> +</dl> + + + + + + + + + + + + + + <h4 class="name" id="getAttachmentsByRole"><span class="type-signature"></span>getAttachmentsByRole<span class="signature">()</span><span class="type-signature"> → {Array.<<a href="BAttachment.html">BAttachment</a>>}</span></h4> + + + + + + + + + + + + + + + + + + +<dl class="details"> + + + + + + + + + + + + + + + + + + + + + + + + + + + <dt class="tag-source">Source:</dt> + <dd class="tag-source"><ul class="dummy"><li> + <a href="becca_entities_brevision.js.html">becca/entities/brevision.js</a>, <a href="becca_entities_brevision.js.html#line147">line 147</a> </li></ul></dd> @@ -1779,6 +2017,318 @@ <h5>Returns:</h5> + + + + + + + <h4 class="name" id="getJsonContent"><span class="type-signature"></span>getJsonContent<span class="signature">()</span><span class="type-signature"> → {*}</span></h4> + + + + + + + + + + + + + + + + + + +<dl class="details"> + + + + + + + + + + + + + + + + + + + + + + + + + + + <dt class="tag-source">Source:</dt> + <dd class="tag-source"><ul class="dummy"><li> + <a href="becca_entities_brevision.js.html">becca/entities/brevision.js</a>, <a href="becca_entities_brevision.js.html#line92">line 92</a> + </li></ul></dd> + + + + + + + +</dl> + + + + + + + + + + + + + +<h5>Throws:</h5> + + + + <div class="param-desc"> + + Error in case of invalid JSON + + </div> + + + + + +<h5>Returns:</h5> + + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">*</span> + + + </dd> +</dl> + + + + + + + + + + + + + + <h4 class="name" id="getJsonContentSafely"><span class="type-signature"></span>getJsonContentSafely<span class="signature">()</span><span class="type-signature"> → {*|null}</span></h4> + + + + + + + + + + + + + + + + + + +<dl class="details"> + + + + + + + + + + + + + + + + + + + + + + + + + + + <dt class="tag-source">Source:</dt> + <dd class="tag-source"><ul class="dummy"><li> + <a href="becca_entities_brevision.js.html">becca/entities/brevision.js</a>, <a href="becca_entities_brevision.js.html#line103">line 103</a> + </li></ul></dd> + + + + + + + +</dl> + + + + + + + + + + + + + + + +<h5>Returns:</h5> + + +<div class="param-desc"> + valid object or null if the content cannot be parsed as JSON +</div> + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">*</span> +| + +<span class="param-type">null</span> + + + </dd> +</dl> + + + + + + + + + + + + + + <h4 class="name" id="getPojo"><span class="type-signature">(abstract, protected) </span>getPojo<span class="signature">()</span><span class="type-signature"></span></h4> + + + + + + + + + + + + + + + + + + +<dl class="details"> + + + + + + + + + <dt class="tag-overrides">Overrides:</dt> + <dd class="tag-overrides"><ul class="dummy"><li> + <a href="AbstractBeccaEntity.html#getPojo">AbstractBeccaEntity#getPojo</a> + </li></ul></dd> + + + + + + + + + + + + + + + + + + + + <dt class="tag-source">Source:</dt> + <dd class="tag-source"><ul class="dummy"><li> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line82">line 82</a> + </li></ul></dd> + + + + + + + +</dl> + + + + + + + + + + + + + + + + + + + + @@ -1838,7 +2388,7 @@ <h4 class="name" id="getPojoToSave"><span class="type-signature">(protected) </s <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line76">line 76</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line74">line 74</a> </li></ul></dd> @@ -1927,7 +2477,7 @@ <h4 class="name" id="getUtcDateChanged"><span class="type-signature">(protected) <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line47">line 47</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line27">line 27</a> </li></ul></dd> @@ -2192,7 +2742,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line263">line 263</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line267">line 267</a> </li></ul></dd> @@ -2281,7 +2831,7 @@ <h4 class="name" id="putEntityChange"><span class="type-signature">(protected) < <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line64">line 64</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line44">line 44</a> </li></ul></dd> @@ -2374,7 +2924,7 @@ <h4 class="name" id="save"><span class="type-signature"></span>save<span class=" <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line85">line 85</a> + <a href="becca_entities_abstract_becca_entity.js.html">becca/entities/abstract_becca_entity.js</a>, <a href="becca_entities_abstract_becca_entity.js.html#line91">line 91</a> </li></ul></dd> @@ -2632,7 +3182,7 @@ <h6>Properties</h6> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="becca_entities_brevision.js.html">becca/entities/brevision.js</a>, <a href="becca_entities_brevision.js.html#line94">line 94</a> + <a href="becca_entities_brevision.js.html">becca/entities/brevision.js</a>, <a href="becca_entities_brevision.js.html#line117">line 117</a> </li></ul></dd> diff --git a/docs/backend_api/BackendScriptApi.html b/docs/backend_api/BackendScriptApi.html index 416bf48af6..73fbd12952 100644 --- a/docs/backend_api/BackendScriptApi.html +++ b/docs/backend_api/BackendScriptApi.html @@ -94,7 +94,7 @@ <h4 class="name" id="BackendScriptApi"><span class="type-signature"></span>new B <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line29">line 29</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line30">line 30</a> </li></ul></dd> @@ -240,7 +240,7 @@ <h5 class="subsection-title">Properties:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line579">line 579</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line594">line 594</a> </li></ul></dd> @@ -352,7 +352,7 @@ <h5 class="subsection-title">Properties:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line45">line 45</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line46">line 46</a> </li></ul></dd> @@ -462,7 +462,7 @@ <h5 class="subsection-title">Properties:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line33">line 33</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line34">line 34</a> </li></ul></dd> @@ -572,7 +572,7 @@ <h5 class="subsection-title">Properties:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line47">line 47</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line48">line 48</a> </li></ul></dd> @@ -682,7 +682,7 @@ <h5 class="subsection-title">Properties:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line35">line 35</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line36">line 36</a> </li></ul></dd> @@ -792,7 +792,7 @@ <h5 class="subsection-title">Properties:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line437">line 437</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line438">line 438</a> </li></ul></dd> @@ -902,7 +902,7 @@ <h5 class="subsection-title">Properties:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line31">line 31</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line32">line 32</a> </li></ul></dd> @@ -1012,7 +1012,7 @@ <h5 class="subsection-title">Properties:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line49">line 49</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line50">line 50</a> </li></ul></dd> @@ -1188,7 +1188,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line198">line 198</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line199">line 199</a> </li></ul></dd> @@ -1691,7 +1691,7 @@ <h6>Properties</h6> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line221">line 221</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line222">line 222</a> </li></ul></dd> @@ -2311,7 +2311,7 @@ <h6>Properties</h6> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line241">line 241</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line242">line 242</a> </li></ul></dd> @@ -2817,7 +2817,7 @@ <h5 class="subsection-title">Properties:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line464">line 464</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line465">line 465</a> </li></ul></dd> @@ -3018,7 +3018,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line181">line 181</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line182">line 182</a> </li></ul></dd> @@ -3200,7 +3200,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line158">line 158</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line159">line 159</a> </li></ul></dd> @@ -3401,7 +3401,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line148">line 148</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line149">line 149</a> </li></ul></dd> @@ -3552,7 +3552,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line425">line 425</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line426">line 426</a> </li></ul></dd> @@ -3753,7 +3753,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line530">line 530</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line531">line 531</a> </li></ul></dd> @@ -3855,7 +3855,7 @@ <h4 class="name" id="getAppInfo"><span class="type-signature"></span>getAppInfo< <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line443">line 443</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line444">line 444</a> </li></ul></dd> @@ -4013,7 +4013,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line78">line 78</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line79">line 79</a> </li></ul></dd> @@ -4167,7 +4167,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line71">line 71</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line72">line 72</a> </li></ul></dd> @@ -4368,7 +4368,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line324">line 324</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line325">line 325</a> </li></ul></dd> @@ -4478,7 +4478,7 @@ <h4 class="name" id="getInstanceName"><span class="type-signature"></span>getIns <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line57">line 57</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line58">line 58</a> </li></ul></dd> @@ -4679,7 +4679,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line355">line 355</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line356">line 356</a> </li></ul></dd> @@ -4833,7 +4833,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line64">line 64</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line65">line 65</a> </li></ul></dd> @@ -5034,7 +5034,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line137">line 137</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line138">line 138</a> </li></ul></dd> @@ -5235,7 +5235,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line127">line 127</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line128">line 128</a> </li></ul></dd> @@ -5341,7 +5341,7 @@ <h4 class="name" id="getRootCalendarNote"><span class="type-signature"></span>ge <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line314">line 314</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line315">line 315</a> </li></ul></dd> @@ -5511,7 +5511,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line333">line 333</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line334">line 334</a> </li></ul></dd> @@ -5814,7 +5814,7 @@ <h6>Properties</h6> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line345">line 345</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line346">line 346</a> </li></ul></dd> @@ -6015,7 +6015,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line365">line 365</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line366">line 366</a> </li></ul></dd> @@ -6168,7 +6168,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line287">line 287</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line288">line 288</a> </li></ul></dd> @@ -6323,7 +6323,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line418">line 418</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line419">line 419</a> </li></ul></dd> @@ -6508,7 +6508,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line543">line 543</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line544">line 544</a> </li></ul></dd> @@ -6566,6 +6566,170 @@ <h5>Returns:</h5> + <h4 class="name" id="runOutsideOfSync"><span class="type-signature"></span>runOutsideOfSync<span class="signature">(callback)</span><span class="type-signature"> → {Promise}</span></h4> + + + + + + +<div class="description"> + Sync process can make data intermittently inconsistent. Scripts which require strong data consistency +can use this function to wait for a possible sync process to finish and prevent new sync process from starting +while it is running. + +Because this is an async process, the inner callback doesn't have automatic transaction handling, so in case +you need to make some DB changes, you need to surround your call with api.transactional(...) +</div> + + + + + + + + + + <h5>Parameters:</h5> + + +<table class="params"> + <thead> + <tr> + + <th>Name</th> + + + <th>Type</th> + + + + + + <th class="last">Description</th> + </tr> + </thead> + + <tbody> + + + <tr> + + <td class="name"><code>callback</code></td> + + + <td class="type"> + + +<span class="param-type">function</span> + + + + </td> + + + + + + <td class="description last">function to be executed while sync process is not running</td> + </tr> + + + </tbody> +</table> + + + + + + +<dl class="details"> + + + + + + + + + + + + + + + + + + + + + + + + + + + <dt class="tag-source">Source:</dt> + <dd class="tag-source"><ul class="dummy"><li> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line587">line 587</a> + </li></ul></dd> + + + + + + + +</dl> + + + + + + + + + + + + + + + +<h5>Returns:</h5> + + +<div class="param-desc"> + - resolves once the callback is finished (callback is awaited) +</div> + + + +<dl> + <dt> + Type + </dt> + <dd> + +<span class="param-type">Promise</span> + + + </dd> +</dl> + + + + + + + + + + + + + <h4 class="name" id="searchForNote"><span class="type-signature"></span>searchForNote<span class="signature">(query, searchParams<span class="signature-attributes">opt</span>)</span><span class="type-signature"> → {<a href="BNote.html">BNote</a>|null}</span></h4> @@ -6711,7 +6875,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line113">line 113</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line114">line 114</a> </li></ul></dd> @@ -6913,7 +7077,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line89">line 89</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line90">line 90</a> </li></ul></dd> @@ -7122,7 +7286,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line399">line 399</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line400">line 400</a> </li></ul></dd> @@ -7465,7 +7629,7 @@ <h5 class="subsection-title">Properties:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line379">line 379</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line380">line 380</a> </li></ul></dd> @@ -7689,7 +7853,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line170">line 170</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line171">line 171</a> </li></ul></dd> @@ -7845,7 +8009,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line409">line 409</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line410">line 410</a> </li></ul></dd> @@ -8000,7 +8164,7 @@ <h5>Parameters:</h5> <dt class="tag-source">Source:</dt> <dd class="tag-source"><ul class="dummy"><li> - <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line432">line 432</a> + <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line433">line 433</a> </li></ul></dd> diff --git a/docs/backend_api/becca_entities_abstract_becca_entity.js.html b/docs/backend_api/becca_entities_abstract_becca_entity.js.html index d54522bc11..e60c3d4b5e 100644 --- a/docs/backend_api/becca_entities_abstract_becca_entity.js.html +++ b/docs/backend_api/becca_entities_abstract_becca_entity.js.html @@ -46,31 +46,11 @@ <h1 class="page-title">Source: becca/entities/abstract_becca_entity.js</h1> class AbstractBeccaEntity { /** @protected */ beforeSaving() { - this.generateIdIfNecessary(); - } - - /** @protected */ - generateIdIfNecessary() { if (!this[this.constructor.primaryKeyName]) { this[this.constructor.primaryKeyName] = utils.newEntityId(); } } - /** @protected */ - generateHash(isDeleted = false) { - let contentToHash = ""; - - for (const propertyName of this.constructor.hashedProperties) { - contentToHash += `|${this[propertyName]}`; - } - - if (isDeleted) { - contentToHash += "|deleted"; - } - - return utils.hash(contentToHash).substr(0, 10); - } - /** @protected */ getUtcDateChanged() { return this.utcDateModified || this.utcDateCreated; @@ -89,7 +69,7 @@ <h1 class="page-title">Source: becca/entities/abstract_becca_entity.js</h1> } /** @protected */ - putEntityChange(isDeleted = false) { + putEntityChange(isDeleted) { entityChangesService.putEntityChange({ entityName: this.constructor.entityName, entityId: this[this.constructor.primaryKeyName], @@ -100,11 +80,37 @@ <h1 class="page-title">Source: becca/entities/abstract_becca_entity.js</h1> }); } + /** + * @protected + * @returns {string} + */ + generateHash(isDeleted) { + let contentToHash = ""; + + for (const propertyName of this.constructor.hashedProperties) { + contentToHash += `|${this[propertyName]}`; + } + + if (isDeleted) { + contentToHash += "|deleted"; + } + + return utils.hash(contentToHash).substr(0, 10); + } + /** @protected */ getPojoToSave() { return this.getPojo(); } + /** + * @protected + * @abstract + */ + getPojo() { + throw new Error(`Unimplemented getPojo() for entity '${this.constructor.name}'`) + } + /** * Saves entity - executes SQL, but doesn't commit the transaction on its own * @@ -116,9 +122,7 @@ <h1 class="page-title">Source: becca/entities/abstract_becca_entity.js</h1> const isNewEntity = !this[primaryKeyName]; - if (this.beforeSaving) { - this.beforeSaving(opts); - } + this.beforeSaving(opts); const pojo = this.getPojoToSave(); @@ -129,7 +133,7 @@ <h1 class="page-title">Source: becca/entities/abstract_becca_entity.js</h1> return; } - this.putEntityChange(false); + this.putEntityChange(!!this.isDeleted); if (!cls.isEntityEventsDisabled()) { const eventPayload = { diff --git a/docs/backend_api/becca_entities_battachment.js.html b/docs/backend_api/becca_entities_battachment.js.html index f76056dfb9..6a389b12f4 100644 --- a/docs/backend_api/becca_entities_battachment.js.html +++ b/docs/backend_api/becca_entities_battachment.js.html @@ -48,8 +48,7 @@ <h1 class="page-title">Source: becca/entities/battachment.js</h1> class BAttachment extends AbstractBeccaEntity { static get entityName() { return "attachments"; } static get primaryKeyName() { return "attachmentId"; } - static get hashedProperties() { return ["attachmentId", "ownerId", "role", "mime", "title", "blobId", - "utcDateScheduledForErasureSince", "utcDateModified"]; } + static get hashedProperties() { return ["attachmentId", "ownerId", "role", "mime", "title", "blobId", "utcDateScheduledForErasureSince"]; } constructor(row) { super(); diff --git a/docs/backend_api/becca_entities_bnote.js.html b/docs/backend_api/becca_entities_bnote.js.html index 6ef8952f17..8d3cd266b3 100644 --- a/docs/backend_api/becca_entities_bnote.js.html +++ b/docs/backend_api/becca_entities_bnote.js.html @@ -160,11 +160,17 @@ <h1 class="page-title">Source: becca/entities/bnote.js</h1> */ this.contentSize = null; /** - * size of the content and note revision contents in bytes + * size of the note content, attachment contents in bytes * @type {int|null} * @private */ - this.noteSize = null; + this.contentAndAttachmentsSize = null; + /** + * size of the note content, attachment contents and revision contents in bytes + * @type {int|null} + * @private + */ + this.contentAndAttachmentsAndRevisionsSize = null; /** * number of note revisions for this note * @type {int|null} @@ -1635,16 +1641,12 @@ <h1 class="page-title">Source: becca/entities/bnote.js</h1> revision.save(); // to generate revisionId, which is then used to save attachments - if (this.type === 'text') { - for (const noteAttachment of this.getAttachments()) { - if (noteAttachment.utcDateScheduledForErasureSince) { - continue; - } - - const revisionAttachment = noteAttachment.copy(); - revisionAttachment.ownerId = revision.revisionId; - revisionAttachment.setContent(noteAttachment.getContent(), {forceSave: true}); + for (const noteAttachment of this.getAttachments()) { + const revisionAttachment = noteAttachment.copy(); + revisionAttachment.ownerId = revision.revisionId; + revisionAttachment.setContent(noteAttachment.getContent(), {forceSave: true}); + if (this.type === 'text') { // content is rewritten to point to the revision attachments noteContent = noteContent.replaceAll(`attachments/${noteAttachment.attachmentId}`, `attachments/${revisionAttachment.attachmentId}`); diff --git a/docs/backend_api/becca_entities_brevision.js.html b/docs/backend_api/becca_entities_brevision.js.html index 331e8cd543..009e72a2e4 100644 --- a/docs/backend_api/becca_entities_brevision.js.html +++ b/docs/backend_api/becca_entities_brevision.js.html @@ -114,6 +114,29 @@ <h1 class="page-title">Source: becca/entities/brevision.js</h1> return this._getContent(); } + /** + * @returns {*} + * @throws Error in case of invalid JSON */ + getJsonContent() { + const content = this.getContent(); + + if (!content || !content.trim()) { + return null; + } + + return JSON.parse(content); + } + + /** @returns {*|null} valid object or null if the content cannot be parsed as JSON */ + getJsonContentSafely() { + try { + return this.getJsonContent(); + } + catch (e) { + return null; + } + } + /** * @param content * @param {object} [opts] @@ -133,6 +156,45 @@ <h1 class="page-title">Source: becca/entities/brevision.js</h1> .map(row => new BAttachment(row)); } + /** @returns {BAttachment|null} */ + getAttachmentById(attachmentId, opts = {}) { + opts.includeContentLength = !!opts.includeContentLength; + + const query = opts.includeContentLength + ? `SELECT attachments.*, LENGTH(blobs.content) AS contentLength + FROM attachments + JOIN blobs USING (blobId) + WHERE ownerId = ? AND attachmentId = ? AND isDeleted = 0` + : `SELECT * FROM attachments WHERE ownerId = ? AND attachmentId = ? AND isDeleted = 0`; + + return sql.getRows(query, [this.revisionId, attachmentId]) + .map(row => new BAttachment(row))[0]; + } + + /** @returns {BAttachment[]} */ + getAttachmentsByRole(role) { + return sql.getRows(` + SELECT attachments.* + FROM attachments + WHERE ownerId = ? + AND role = ? + AND isDeleted = 0 + ORDER BY position`, [this.revisionId, role]) + .map(row => new BAttachment(row)); + } + + /** @returns {BAttachment} */ + getAttachmentByTitle(title) { + return sql.getRows(` + SELECT attachments.* + FROM attachments + WHERE ownerId = ? + AND title = ? + AND isDeleted = 0 + ORDER BY position`, [this.revisionId, title]) + .map(row => new BAttachment(row))[0]; + } + beforeSaving() { super.beforeSaving(); diff --git a/docs/backend_api/services_backend_script_api.js.html b/docs/backend_api/services_backend_script_api.js.html index a0a6c60f14..4bc787c464 100644 --- a/docs/backend_api/services_backend_script_api.js.html +++ b/docs/backend_api/services_backend_script_api.js.html @@ -47,6 +47,7 @@ <h1 class="page-title">Source: services/backend_script_api.js</h1> const specialNotesService = require("./special_notes"); const branchService = require("./branches"); const exportService = require("./export/zip"); +const syncMutex = require("./sync_mutex.js"); /** * <p>This is the main backend API interface for scripts. All the properties and methods are published in the "api" object @@ -599,6 +600,20 @@ <h1 class="page-title">Source: services/backend_script_api.js</h1> } }; + /** + * Sync process can make data intermittently inconsistent. Scripts which require strong data consistency + * can use this function to wait for a possible sync process to finish and prevent new sync process from starting + * while it is running. + * + * Because this is an async process, the inner callback doesn't have automatic transaction handling, so in case + * you need to make some DB changes, you need to surround your call with api.transactional(...) + * + * @method + * @param {function} callback - function to be executed while sync process is not running + * @returns {Promise} - resolves once the callback is finished (callback is awaited) + */ + this.runOutsideOfSync = syncMutex.doExclusively; + /** * This object contains "at your risk" and "no BC guarantees" objects for advanced use cases. * diff --git a/src/services/backend_script_api.js b/src/services/backend_script_api.js index 3cad855358..5854e002fd 100644 --- a/src/services/backend_script_api.js +++ b/src/services/backend_script_api.js @@ -19,6 +19,7 @@ const SpacedUpdate = require("./spaced_update"); const specialNotesService = require("./special_notes"); const branchService = require("./branches"); const exportService = require("./export/zip"); +const syncMutex = require("./sync_mutex.js"); /** * <p>This is the main backend API interface for scripts. All the properties and methods are published in the "api" object @@ -571,6 +572,20 @@ function BackendScriptApi(currentNote, apiParams) { } }; + /** + * Sync process can make data intermittently inconsistent. Scripts which require strong data consistency + * can use this function to wait for a possible sync process to finish and prevent new sync process from starting + * while it is running. + * + * Because this is an async process, the inner callback doesn't have automatic transaction handling, so in case + * you need to make some DB changes, you need to surround your call with api.transactional(...) + * + * @method + * @param {function} callback - function to be executed while sync process is not running + * @returns {Promise} - resolves once the callback is finished (callback is awaited) + */ + this.runOutsideOfSync = syncMutex.doExclusively; + /** * This object contains "at your risk" and "no BC guarantees" objects for advanced use cases. * diff --git a/src/services/sync_mutex.js b/src/services/sync_mutex.js index 819371e808..fb95d03c43 100644 --- a/src/services/sync_mutex.js +++ b/src/services/sync_mutex.js @@ -1,5 +1,5 @@ /** - * Sync makes process can make data intermittently inconsistent. Processes which require strong data consistency + * Sync process can make data intermittently inconsistent. Processes which require strong data consistency * (like consistency checks) can use this mutex to make sure sync isn't currently running. */ From 87a60e325f0959ed537a59783296e9379cad77e1 Mon Sep 17 00:00:00 2001 From: zadam <zadam.apps@gmail.com> Date: Thu, 19 Oct 2023 00:51:38 +0200 Subject: [PATCH 15/15] added ctime to backup list #4321 --- src/public/app/widgets/type_widgets/options/backup.js | 6 +++--- src/services/backup.js | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/public/app/widgets/type_widgets/options/backup.js b/src/public/app/widgets/type_widgets/options/backup.js index a5c5b0c13f..c8a07b8585 100644 --- a/src/public/app/widgets/type_widgets/options/backup.js +++ b/src/public/app/widgets/type_widgets/options/backup.js @@ -84,11 +84,11 @@ export default class BackupOptions extends OptionsWidget { this.$existingBackupList.empty(); if (!backupFiles.length) { - backupFiles = [{filePath: "no backup yet"}]; + backupFiles = [{filePath: "no backup yet", ctime: ''}]; } - for (const {filePath} of backupFiles) { - this.$existingBackupList.append($("<li>").text(filePath)); + for (const {filePath, ctime} of backupFiles) { + this.$existingBackupList.append($("<li>").text(`${filePath} ${ctime ? ` - ${ctime}` : ''}`)); } }); } diff --git a/src/services/backup.js b/src/services/backup.js index 808331ff93..29fbbd0a40 100644 --- a/src/services/backup.js +++ b/src/services/backup.js @@ -17,10 +17,12 @@ function getExistingBackups() { return fs.readdirSync(dataDir.BACKUP_DIR) .filter(fileName => fileName.includes("backup")) - .map(fileName => ({ - fileName: fileName, - filePath: path.resolve(dataDir.BACKUP_DIR, fileName) - })); + .map(fileName => { + const filePath = path.resolve(dataDir.BACKUP_DIR, fileName); + const stat = fs.statSync(filePath) + + return {fileName, filePath, ctime: stat.ctime}; + }); } function regularBackup() {