release 0.4.1

README.md

@@ -17,7 +17,7 @@ Trilium Notes is a hierarchical note taking application. Picture tells a thousan
 ## Builds
 
 * If you want to install Trilium on server, follow [this page](https://github.com/zadam/trilium/wiki/Installation-as-webapp)
-* If you want to use Trilium on the desktop, download binary release for your platfor from [latest release](https://github.com/zadam/trilium/releases/latest), unzip the package and run ```trilium``` executable.
+* If you want to use Trilium on the desktop, download binary release for your platform from [latest release](https://github.com/zadam/trilium/releases/latest), unzip the package and run ```trilium``` executable.
 
 ## Supported platforms
 

app.js

@@ -73,6 +73,8 @@ require('./services/backup');
 // trigger consistency checks timer
 require('./services/consistency_checks');
 
+require('./plugins/reddit');
+
 module.exports = {
     app,
     sessionParser

bin/build.sh

@@ -1,22 +1,34 @@
 #!/usr/bin/env bash
 
-echo "Deleting dist"
+echo "Deleting existing builds"
 
 rm -r dist/*
 
-cp -r ../trilium-node-binaries/sqlite/* node_modules/sqlite3/lib/binding/
-
-cp -r ../trilium-node-binaries/scrypt/* node_modules/scrypt/bin/
-
+echo "Rebuilding binaries for linux-ia32"
 ./node_modules/.bin/electron-rebuild --arch=ia32
 
 ./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=ia32 --overwrite
 
+./node_modules/.bin/electron-packager . --out=dist --platform=win32 --arch=x64 --overwrite
+
+# we build x64 as second so that we keep X64 binaries in node_modules for local development
+echo "Rebuilding binaries for linux-x64"
 ./node_modules/.bin/electron-rebuild --arch=x64
 
 ./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=x64 --overwrite
 
-./node_modules/.bin/electron-packager . --out=dist --platform=win32 --arch=x64 --overwrite
+echo "Copying required windows binaries"
 
-# can't copy this before the packaging because the same file name is used for both linux and windows build
-cp ../trilium-node-binaries/scrypt.node ./dist/trilium-win32-x64/resources/app/node_modules/scrypt/build/Release/
+WIN_RES_DIR=./dist/trilium-win32-x64/resources/app
+
+cp -r bin/deps/sqlite/* $WIN_RES_DIR/node_modules/sqlite3/lib/binding/
+cp bin/deps/image/cjpeg.exe $WIN_RES_DIR/node_modules/mozjpeg/vendor/
+cp bin/deps/image/pngquant.exe $WIN_RES_DIR/node_modules/pngquant-bin/vendor/
+cp bin/deps/image/gifsicle.exe $WIN_RES_DIR/node_modules/giflossy/vendor/
+cp bin/deps/scrypt.node $WIN_RES_DIR/node_modules/scrypt/build/Release/
+
+echo "Cleaning up unnecessary binaries from all builds"
+
+rm -r ./dist/trilium-linux-ia32/resources/app/bin/deps
+rm -r ./dist/trilium-linux-x64/resources/app/bin/deps
+rm -r ./dist/trilium-win32-x64/resources/app/bin/deps

db/main_notes.sql

@@ -1,5 +1,5 @@
 INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('root', 'root', 'root', 0, 0, '2017-12-22T11:41:07.000Z', '2017-12-22T11:41:07.000Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('1Heh2acXfPNt', 'Trilium Demo', '<p><strong>Welcome to Trilium Notes!</strong></p><p>&nbsp;</p><p>This is initial document provided by default Trilium to showcase some of its features and also give you some ideas how you might structure your notes. You can play with it, modify note content and tree structure as you wish.</p><p>&nbsp;</p><p>If you need any help, visit Trilium wesite: <a href="https://github.com/zadam/trilium">https://github.com/zadam/trilium</a></p><h3>Cleanup</h3><p>Once you''re finished with experimenting and want to cleanup these pages, you can simply delete them all.</p><h3>Formatting</h3><p>Trilium supports classic formatting like <i>italic</i>, <strong>bold</strong>, <i><strong>bold and italic</strong></i>. Of course you can add links like this one pointing to <a href="http://www.google.com">google.com</a></p><h4>Lists</h4><p><strong>Ordered:</strong></p><ol><li>First Item</li><li>Second item<ol><li>First sub-item</li><li>Second sub-item</li></ol></li></ol><p>&nbsp;</p><p><strong>Unordered:</strong></p><ul><li>Item</li><li>Another item<ul><li>Sub-item<ul><li>Sub-sub-item</li></ul></li></ul></li></ul><h4>Block quotes</h4><blockquote><p>Whereof one cannot speak, thereof one must be silent”</p><p>– Ludwig Wittgenstein</p></blockquote><p>&nbsp;</p>', 0, 0, '2017-12-23T00:46:39.304Z', '2017-12-23T04:08:45.445Z');
+INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('1Heh2acXfPNt', 'Trilium Demo', '<figure class="image image-style-side"><img src="/api/images/ed64aET6i379/trilium-small.png"></figure><p><strong>Welcome to Trilium Notes!</strong></p><p>&nbsp;</p><p>This is initial document provided by default Trilium to showcase some of its features and also give you some ideas how you might structure your notes. You can play with it, modify note content and tree structure as you wish.</p><p>&nbsp;</p><p>If you need any help, visit Trilium website: <a href="https://github.com/zadam/trilium">https://github.com/zadam/trilium</a></p><h3>Cleanup</h3><p>Once you''re finished with experimenting and want to cleanup these pages, you can simply delete them all.</p><h3>Formatting</h3><p>Trilium supports classic formatting like <i>italic</i>, <strong>bold</strong>, <i><strong>bold and italic</strong></i>. Of course you can add links like this one pointing to <a href="http://www.google.com">google.com</a></p><h4>Lists</h4><p><strong>Ordered:</strong></p><ol><li>First Item</li><li>Second item<ol><li>First sub-item</li><li>Second sub-item</li></ol></li></ol><p>&nbsp;</p><p><strong>Unordered:</strong></p><ul><li>Item</li><li>Another item<ul><li>Sub-item<ul><li>Sub-sub-item</li></ul></li></ul></li></ul><h4>Block quotes</h4><blockquote><p>Whereof one cannot speak, thereof one must be silent”</p><p>– Ludwig Wittgenstein</p></blockquote><p>&nbsp;</p>', 0, 0, '2017-12-23T00:46:39.304Z', '2017-12-23T04:08:45.445Z');
 INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('3RkyK9LI18dO', 'Journal', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T01:20:04.181Z', '2017-12-23T18:07:55.377Z');
 INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('L1Ox40M1aEyy', '2016', '<p>No content.</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>', 0, 0, '2017-12-23T01:20:45.365Z', '2017-12-23T16:40:43.129Z');
 INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('HJusZTbBU494', '2017', '<p>No content.</p>', 0, 0, '2017-12-23T01:20:50.709Z', '2017-12-23T16:41:03.119Z');

db/main_notes_image.sql

@@ -0,0 +1 @@
+INSERT INTO notes_image (note_image_id, note_id, image_id, is_deleted, date_modified, date_created) VALUES ('2EtgRRPfk4Fi', '1Heh2acXfPNt', 'ed64aET6i379', 0, '2018-01-08T04:41:30.663Z', '2018-01-08T04:41:30.663Z');

db/schema.sql

@@ -1,6 +1,7 @@
 CREATE TABLE IF NOT EXISTS "options" (
 	`opt_name`	TEXT NOT NULL PRIMARY KEY,
 	`opt_value`	TEXT,
+  `is_synced` INTEGER NOT NULL DEFAULT 0,
 	`date_modified` INT
 );
 CREATE TABLE IF NOT EXISTS "sync" (
@@ -83,3 +84,41 @@ CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
 CREATE INDEX `IDX_notes_history_note_date_modified_to` ON `notes_history` (
   `date_modified_to`
 );
+CREATE TABLE images
+(
+  image_id TEXT PRIMARY KEY NOT NULL,
+  format TEXT NOT NULL,
+  checksum TEXT NOT NULL,
+  name TEXT NOT NULL,
+  data BLOB,
+  is_deleted INT NOT NULL DEFAULT 0,
+  date_modified TEXT NOT NULL,
+  date_created TEXT NOT NULL
+);
+
+CREATE TABLE notes_image
+(
+  note_image_id TEXT PRIMARY KEY NOT NULL,
+  note_id TEXT NOT NULL,
+  image_id TEXT NOT NULL,
+  is_deleted INT NOT NULL DEFAULT 0,
+  date_modified TEXT NOT NULL,
+  date_created TEXT NOT NULL
+);
+
+CREATE INDEX notes_image_note_id_index ON notes_image (note_id);
+CREATE INDEX notes_image_image_id_index ON notes_image (image_id);
+CREATE INDEX notes_image_note_id_image_id_index ON notes_image (note_id, image_id);
+
+CREATE TABLE attributes
+(
+  attribute_id TEXT PRIMARY KEY NOT NULL,
+  note_id TEXT NOT NULL,
+  name TEXT NOT NULL,
+  value TEXT,
+  date_created TEXT NOT NULL,
+  date_modified TEXT NOT NULL
+);
+
+CREATE INDEX attributes_note_id_index ON attributes (note_id);
+CREATE UNIQUE INDEX attributes_note_id_name_index ON attributes (note_id, name);

index.js

@@ -2,6 +2,7 @@
 const electron = require('electron');
 const path = require('path');
 const config = require('./services/config');
+const url = require("url");
 
 const app = electron.app;
 
@@ -38,6 +39,16 @@ function createMainWindow() {
         }
     });
 
+    // prevent drag & drop to navigate away from trilium
+    win.webContents.on('will-navigate', (ev, targetUrl) => {
+        const parsedUrl = url.parse(targetUrl);
+
+        // we still need to allow internal redirects from setup and migration pages
+        if (parsedUrl.hostname !== 'localhost' || (parsedUrl.path && parsedUrl.path !== '/')) {
+            ev.preventDefault();
+        }
+    });
+
     return win;
 }
 

migrations/0066__create_attributes_table.sql

@@ -0,0 +1,12 @@
+CREATE TABLE attributes
+(
+  attribute_id TEXT PRIMARY KEY NOT NULL,
+  note_id TEXT NOT NULL,
+  name TEXT NOT NULL,
+  value TEXT,
+  date_created TEXT NOT NULL,
+  date_modified TEXT NOT NULL
+);
+
+CREATE INDEX attributes_note_id_index ON attributes (note_id);
+CREATE UNIQUE INDEX attributes_note_id_name_index ON attributes (note_id, name);

migrations/0067__add_is_synced_to_options.sql

@@ -0,0 +1,5 @@
+ALTER TABLE options ADD COLUMN is_synced INTEGER NOT NULL DEFAULT 0;
+
+UPDATE options SET is_synced = 1 WHERE opt_name IN ('username', 'password_verification_hash', 'password_verification_salt',
+                                                    'password_derived_key_salt', 'encrypted_data_key', 'encrypted_data_key_iv',
+                                                    'protected_session_timeout', 'history_snapshot_time_interval');

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.2.2",
+  "version": "0.3.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -419,6 +419,15 @@
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
       "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
     },
+    "axios": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.17.1.tgz",
+      "integrity": "sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0=",
+      "requires": {
+        "follow-redirects": "1.3.0",
+        "is-buffer": "1.1.6"
+      }
+    },
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -4576,6 +4585,14 @@
       "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
       "dev": true
     },
+    "follow-redirects": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.3.0.tgz",
+      "integrity": "sha1-9oSHH8EW0uMp/aVe9naH9Pq8kFw=",
+      "requires": {
+        "debug": "3.1.0"
+      }
+    },
     "for-each": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz",
@@ -7135,9 +7152,9 @@
       }
     },
     "moment": {
-      "version": "2.19.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
-      "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc="
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
+      "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="
     },
     "mozjpeg": {
       "version": "5.0.0",
@@ -9073,7 +9090,7 @@
       "integrity": "sha512-bJ8tGZX/48oSzv4VWVQwue4JvjZhLNCZv8+LZG1h4UQKEh0oFmbYiOVmHsEyTArfNk03Cx+DJPP0Azc/F9N62w==",
       "requires": {
         "lodash": "4.17.4",
-        "moment": "2.19.1"
+        "moment": "2.20.1"
       }
     },
     "single-line-log": {
@@ -10835,6 +10852,14 @@
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
       "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
     },
+    "unescape": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unescape/-/unescape-1.0.1.tgz",
+      "integrity": "sha512-O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ==",
+      "requires": {
+        "extend-shallow": "2.0.1"
+      }
+    },
     "uniq": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "trilium",
   "description": "Trilium Notes",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "license": "AGPL-3.0-only",
   "repository": {
     "type": "git",
@@ -20,6 +20,7 @@
   },
   "dependencies": {
     "async-mutex": "^0.1.3",
+    "axios": "^0.17.1",
     "body-parser": "~1.18.2",
     "cookie-parser": "~1.4.3",
     "debug": "~3.1.0",
@@ -41,6 +42,7 @@
     "imagemin-pngquant": "^5.0.1",
     "ini": "^1.3.4",
     "jimp": "^0.2.28",
+    "moment": "^2.20.1",
     "multer": "^1.3.0",
     "rand-token": "^0.4.0",
     "request": "^2.83.0",
@@ -52,6 +54,7 @@
     "session-file-store": "^1.1.2",
     "simple-node-logger": "^0.93.30",
     "sqlite": "^2.9.0",
+    "unescape": "^1.0.1",
     "ws": "^3.3.2"
   },
   "devDependencies": {

plugins/reddit.js

@@ -0,0 +1,231 @@
+"use strict";
+
+const sql = require('../services/sql');
+const notes = require('../services/notes');
+const axios = require('axios');
+const log = require('../services/log');
+const utils = require('../services/utils');
+const unescape = require('unescape');
+const attributes = require('../services/attributes');
+const sync_mutex = require('../services/sync_mutex');
+const config = require('../services/config');
+
+const CALENDAR_ROOT_ATTRIBUTE = 'calendar_root';
+const YEAR_ATTRIBUTE = 'year_note';
+const MONTH_ATTRIBUTE = 'month_note';
+const DATE_ATTRIBUTE = 'date_note';
+
+// "reddit" date note is subnote of date note which contains all reddit comments from that date
+const REDDIT_DATE_ATTRIBUTE = 'reddit_date_note';
+
+async function createNote(parentNoteId, noteTitle, noteText) {
+    return (await notes.createNewNote(parentNoteId, {
+        note_title: noteTitle,
+        note_text: noteText,
+        target: 'into',
+        is_protected: false
+    })).noteId;
+}
+
+function redditId(kind, id) {
+    return kind + "_" + id;
+}
+
+async function getNoteStartingWith(parentNoteId, startsWith) {
+    return await sql.getFirstValue(`SELECT note_id FROM notes JOIN notes_tree USING(note_id) 
+                                    WHERE parent_note_id = ? AND note_title LIKE '${startsWith}%'
+                                    AND notes.is_deleted = 0 AND is_protected = 0 
+                                    AND notes_tree.is_deleted = 0`, [parentNoteId]);
+}
+
+async function getRootNoteId() {
+    let rootNoteId = await sql.getFirstValue(`SELECT notes.note_id FROM notes JOIN attributes USING(note_id) 
+              WHERE attributes.name = '${CALENDAR_ROOT_ATTRIBUTE}' AND notes.is_deleted = 0`);
+
+    if (!rootNoteId) {
+        rootNoteId = (await notes.createNewNote('root', {
+            note_title: 'Calendar',
+            target: 'into',
+            is_protected: false
+        })).noteId;
+
+        await attributes.createAttribute(rootNoteId, CALENDAR_ROOT_ATTRIBUTE);
+    }
+
+    return rootNoteId;
+}
+
+async function getYearNoteId(dateTimeStr, rootNoteId) {
+    const yearStr = dateTimeStr.substr(0, 4);
+
+    let yearNoteId = await attributes.getNoteIdWithAttribute(YEAR_ATTRIBUTE, yearStr);
+
+    if (!yearNoteId) {
+        yearNoteId = await getNoteStartingWith(rootNoteId, yearStr);
+
+        if (!yearNoteId) {
+            yearNoteId = await createNote(rootNoteId, yearStr);
+        }
+
+        await attributes.createAttribute(yearNoteId, YEAR_ATTRIBUTE, yearStr);
+    }
+
+    return yearNoteId;
+}
+
+async function getMonthNoteId(dateTimeStr, rootNoteId) {
+    const monthStr = dateTimeStr.substr(0, 7);
+    const monthNumber = dateTimeStr.substr(5, 2);
+
+    let monthNoteId = await attributes.getNoteIdWithAttribute(MONTH_ATTRIBUTE, monthStr);
+
+    if (!monthNoteId) {
+        const yearNoteId = await getYearNoteId(dateTimeStr, rootNoteId);
+
+        monthNoteId = await getNoteStartingWith(yearNoteId, monthNumber);
+
+        if (!monthNoteId) {
+            monthNoteId = await createNote(yearNoteId, monthNumber);
+        }
+
+        await attributes.createAttribute(monthNoteId, MONTH_ATTRIBUTE, monthStr);
+    }
+
+    return monthNoteId;
+}
+
+async function getDateNoteId(dateTimeStr, rootNoteId) {
+    const dateStr = dateTimeStr.substr(0, 10);
+    const dayNumber = dateTimeStr.substr(8, 2);
+
+    let dateNoteId = await attributes.getNoteIdWithAttribute(DATE_ATTRIBUTE, dateStr);
+
+    if (!dateNoteId) {
+        const monthNoteId = await getMonthNoteId(dateTimeStr, rootNoteId);
+
+        dateNoteId = await getNoteStartingWith(monthNoteId, dayNumber);
+
+        if (!dateNoteId) {
+            dateNoteId = await createNote(monthNoteId, dayNumber);
+        }
+
+        await attributes.createAttribute(dateNoteId, DATE_ATTRIBUTE, dateStr);
+    }
+
+    return dateNoteId;
+}
+
+async function getDateNoteIdForReddit(dateTimeStr, rootNoteId) {
+    const dateStr = dateTimeStr.substr(0, 10);
+
+    let redditDateNoteId = await attributes.getNoteIdWithAttribute(REDDIT_DATE_ATTRIBUTE, dateStr);
+
+    if (!redditDateNoteId) {
+        const dateNoteId = await getDateNoteId(dateTimeStr, rootNoteId);
+
+        redditDateNoteId = await createNote(dateNoteId, "Reddit");
+
+        await attributes.createAttribute(redditDateNoteId, REDDIT_DATE_ATTRIBUTE, dateStr);
+    }
+
+    return redditDateNoteId;
+}
+
+async function importComments(rootNoteId, accountName, afterId = null) {
+    let url = `https://www.reddit.com/user/${accountName}.json`;
+
+    if (afterId) {
+        url += "?after=" + afterId;
+    }
+
+    const response = await axios.get(url);
+    const listing = response.data;
+
+    if (listing.kind !== 'Listing') {
+        log.info(`Reddit: Unknown object kind ${listing.kind}`);
+        return;
+    }
+
+    const children = listing.data.children;
+
+    let importedComments = 0;
+
+    for (const child of children) {
+        const comment = child.data;
+
+        let commentNoteId = await attributes.getNoteIdWithAttribute('reddit_id', redditId(child.kind, comment.id));
+
+        if (commentNoteId) {
+            continue;
+        }
+
+        const dateTimeStr = utils.dateStr(new Date(comment.created_utc * 1000));
+
+        const permaLink = 'https://reddit.com' + comment.permalink;
+
+        const noteText =
+`<p><a href="${permaLink}">${permaLink}</a></p>
+<p>author: <a href="https://reddit.com/u/${comment.author}">${comment.author}</a>, 
+subreddit: <a href="https://reddit.com/r/${comment.subreddit}">${comment.subreddit}</a>, 
+karma: ${comment.score}, created at ${dateTimeStr}</p><p></p>`
+            + unescape(comment.body_html);
+
+        let parentNoteId = await getDateNoteIdForReddit(dateTimeStr, rootNoteId);
+
+        commentNoteId = await createNote(parentNoteId, comment.link_title, noteText);
+
+        log.info("Reddit: Imported comment to note " + commentNoteId);
+        importedComments++;
+
+        await sql.doInTransaction(async () => {
+            await attributes.createAttribute(commentNoteId, "reddit_kind", child.kind);
+            await attributes.createAttribute(commentNoteId, "reddit_id", redditId(child.kind, comment.id));
+            await attributes.createAttribute(commentNoteId, "reddit_created_utc", comment.created_utc);
+        });
+    }
+
+    // if there have been no imported comments on this page, there shouldn't be any to import
+    // on the next page since those are older
+    if (listing.data.after && importedComments > 0) {
+        importedComments += await importComments(rootNoteId, accountName, listing.data.after);
+    }
+
+    return importedComments;
+}
+
+let redditAccounts = [];
+
+async function runImport() {
+    const rootNoteId = await getRootNoteId();
+
+    // technically mutex shouldn't be necessary but we want to avoid doing potentially expensive import
+    // concurrently with sync
+    await sync_mutex.doExclusively(async () => {
+        let importedComments = 0;
+
+        for (const account of redditAccounts) {
+            importedComments += await importComments(rootNoteId, account);
+        }
+
+        log.info(`Reddit: Imported ${importedComments} comments.`);
+    });
+}
+
+sql.dbReady.then(async () => {
+    if (!config['Reddit'] || config['Reddit']['enabled'] !== true) {
+        return;
+    }
+
+    const redditAccountsStr = config['Reddit']['accounts'];
+
+    if (!redditAccountsStr) {
+        log.info("Reddit: No reddit accounts defined in option 'reddit_accounts'");
+    }
+
+    redditAccounts = redditAccountsStr.split(",").map(s => s.trim());
+
+    const pollingIntervalInSeconds = config['Reddit']['pollingIntervalInSeconds'] || (4 * 3600);
+
+    setInterval(runImport, pollingIntervalInSeconds * 1000);
+    setTimeout(runImport, 10000); // 10 seconds after startup - intentionally after initial sync
+});

public/javascripts/cloning.js

@@ -0,0 +1,33 @@
+"use strict";
+
+const cloning = (function() {
+    async function cloneNoteTo(childNoteId, parentNoteId, prefix) {
+        const resp = await server.put('notes/' + childNoteId + '/clone-to/' + parentNoteId, {
+            prefix: prefix
+        });
+
+        if (!resp.success) {
+            alert(resp.message);
+            return;
+        }
+
+        await noteTree.reload();
+    }
+
+    // beware that first arg is noteId and second is noteTreeId!
+    async function cloneNoteAfter(noteId, afterNoteTreeId) {
+        const resp = await server.put('notes/' + noteId + '/clone-after/' + afterNoteTreeId);
+
+        if (!resp.success) {
+            alert(resp.message);
+            return;
+        }
+
+        await noteTree.reload();
+    }
+
+    return {
+        cloneNoteAfter,
+        cloneNoteTo
+    };
+})();

public/javascripts/context_menu.js

@@ -19,7 +19,7 @@ const contextMenu = (function() {
         }
         else if (clipboardMode === 'copy') {
             for (const noteId of clipboardIds) {
-                treeChanges.cloneNoteAfter(noteId, node.data.note_tree_id);
+                cloning.cloneNoteAfter(noteId, node.data.note_tree_id);
             }
 
             // copy will keep clipboardIds and clipboardMode so it's possible to paste into multiple places
@@ -45,7 +45,7 @@ const contextMenu = (function() {
         }
         else if (clipboardMode === 'copy') {
             for (const noteId of clipboardIds) {
-                treeChanges.cloneNoteTo(noteId, node.data.note_id);
+                cloning.cloneNoteTo(noteId, node.data.note_id);
             }
             // copy will keep clipboardIds and clipboardMode so it's possible to paste into multiple places
         }
@@ -90,7 +90,9 @@ const contextMenu = (function() {
             {title: "Paste after", cmd: "pasteAfter", uiIcon: "ui-icon-clipboard"},
             {title: "----"},
             {title: "Collapse sub-tree <kbd>Alt+-</kbd>", cmd: "collapse-sub-tree", uiIcon: "ui-icon-minus"},
-            {title: "Force note sync", cmd: "force-note-sync", uiIcon: "ui-icon-refresh"}
+            {title: "Force note sync", cmd: "force-note-sync", uiIcon: "ui-icon-refresh"},
+            {title: "Sort alphabetically <kbd>Alt+s</kbd>", cmd: "sort-alphabetically", uiIcon: " ui-icon-arrowthick-2-n-s"}
+
         ],
         beforeOpen: (event, ui) => {
             const node = $.ui.fancytree.getNode(ui.target);
@@ -139,7 +141,7 @@ const contextMenu = (function() {
                 pasteInto(node);
             }
             else if (ui.cmd === "delete") {
-                treeChanges.deleteNode(node);
+                treeChanges.deleteNodes(noteTree.getSelectedNodes(true));
             }
             else if (ui.cmd === "collapse-sub-tree") {
                 noteTree.collapseTree(node);
@@ -147,6 +149,9 @@ const contextMenu = (function() {
             else if (ui.cmd === "force-note-sync") {
                 forceNoteSync(node.data.note_id);
             }
+            else if (ui.cmd === "sort-alphabetically") {
+                noteTree.sortAlphabetically(node.data.note_id);
+            }
             else {
                 messaging.logError("Unknown command: " + ui.cmd);
             }

public/javascripts/dialogs/add_link.js

@@ -78,14 +78,14 @@ const addLink = (function() {
             else if (linkType === 'selected-to-current') {
                 const prefix = clonePrefixEl.val();
 
-                treeChanges.cloneNoteTo(noteId, noteEditor.getCurrentNoteId(), prefix);
+                cloning.cloneNoteTo(noteId, noteEditor.getCurrentNoteId(), prefix);
 
                 dialogEl.dialog("close");
             }
             else if (linkType === 'current-to-selected') {
                 const prefix = clonePrefixEl.val();
 
-                treeChanges.cloneNoteTo(noteEditor.getCurrentNoteId(), noteId, prefix);
+                cloning.cloneNoteTo(noteEditor.getCurrentNoteId(), noteId, prefix);
 
                 dialogEl.dialog("close");
             }

public/javascripts/dialogs/attributes.js

@@ -0,0 +1,62 @@
+"use strict";
+
+const attributesDialog = (function() {
+    const dialogEl = $("#attributes-dialog");
+    const attributesModel = new AttributesModel();
+
+    function AttributesModel() {
+        const self = this;
+
+        this.attributes = ko.observableArray();
+
+        this.loadAttributes = async function() {
+            const noteId = noteEditor.getCurrentNoteId();
+
+            const attributes = await server.get('notes/' + noteId + '/attributes');
+
+            this.attributes(attributes);
+        };
+
+        this.addNewRow = function() {
+            self.attributes.push({
+                attribute_id: '',
+                name: '',
+                value: ''
+            });
+        };
+
+        this.save = async function() {
+            const noteId = noteEditor.getCurrentNoteId();
+
+            const attributes = await server.put('notes/' + noteId + '/attributes', this.attributes());
+
+            self.attributes(attributes);
+
+            showMessage("Attributes have been saved.");
+        };
+    }
+
+    async function showDialog() {
+        glob.activeDialog = dialogEl;
+
+        dialogEl.dialog({
+            modal: true,
+            width: 800,
+            height: 700
+        });
+
+        attributesModel.loadAttributes();
+    }
+
+    $(document).bind('keydown', 'alt+a', e => {
+        showDialog();
+
+        e.preventDefault();
+    });
+
+    ko.applyBindings(attributesModel);
+
+    return {
+        showDialog
+    };
+})();

public/javascripts/dialogs/recent_notes.js

@@ -86,13 +86,13 @@ const recentNotes = (function() {
     }
 
     async function addCurrentAsChild() {
-        await treeChanges.cloneNoteTo(noteEditor.getCurrentNoteId(), getSelectedNoteId());
+        await cloning.cloneNoteTo(noteEditor.getCurrentNoteId(), getSelectedNoteId());
 
         dialogEl.dialog("close");
     }
 
     async function addRecentAsChild() {
-        await treeChanges.cloneNoteTo(getSelectedNoteId(), noteEditor.getCurrentNoteId());
+        await cloning.cloneNoteTo(getSelectedNoteId(), noteEditor.getCurrentNoteId());
 
         dialogEl.dialog("close");
     }

public/javascripts/dialogs/settings.js

@@ -157,6 +157,7 @@ settings.addModule((async function () {
     const fillSyncRowsButton = $("#fill-sync-rows-button");
     const anonymizeButton = $("#anonymize-button");
     const cleanupSoftDeletedButton = $("#cleanup-soft-deleted-items-button");
+    const cleanupUnusedImagesButton = $("#cleanup-unused-images-button");
     const vacuumDatabaseButton = $("#vacuum-database-button");
 
     forceFullSyncButton.click(async () => {
@@ -186,6 +187,14 @@ settings.addModule((async function () {
         }
     });
 
+    cleanupUnusedImagesButton.click(async () => {
+        if (confirm("Do you really want to clean up unused images?")) {
+            await server.post('cleanup/cleanup-unused-images');
+
+            showMessage("Unused images have been cleaned up");
+        }
+    });
+
     vacuumDatabaseButton.click(async () => {
         await server.post('cleanup/vacuum-database');
 

public/javascripts/note_editor.js

@@ -121,7 +121,8 @@ const noteEditor = (function() {
 
         noteTitleEl.val(currentNote.detail.note_title);
 
-        editor.setData(currentNote.detail.note_text);
+        // temporary workaround for https://github.com/ckeditor/ckeditor5-enter/issues/49
+        editor.setData(currentNote.detail.note_text ? currentNote.detail.note_text : "<p></p>");
 
         noteChangeDisabled = false;
 

public/javascripts/note_tree.js

@@ -200,7 +200,7 @@ const noteTree = (function() {
         return noteList;
     }
 
-    async function activateNode(notePath) {
+    async function expandToNote(notePath, expandOpts) {
         assertArguments(notePath);
 
         const runPath = getRunPath(notePath);
@@ -213,14 +213,22 @@ const noteTree = (function() {
             const node = getNodesByNoteId(childNoteId).find(node => node.data.parent_note_id === parentNoteId);
 
             if (childNoteId === noteId) {
-                await node.setActive();
+                return node;
             }
             else {
-                await node.setExpanded();
+                await node.setExpanded(true, expandOpts);
             }
 
             parentNoteId = childNoteId;
         }
+    }
+
+    async function activateNode(notePath) {
+        assertArguments(notePath);
+
+        const node = await expandToNote(notePath);
+
+        await node.setActive();
 
         clearSelectedNodes();
     }
@@ -368,7 +376,7 @@ const noteTree = (function() {
 
         const expandedNum = isExpanded ? 1 : 0;
 
-        await server.put('notes/' + noteTreeId + '/expanded/' + expandedNum);
+        await server.put('tree/' + noteTreeId + '/expanded/' + expandedNum);
     }
 
     function setCurrentNotePathToHash(node) {
@@ -382,8 +390,8 @@ const noteTree = (function() {
         recentNotes.addRecentNote(currentNoteTreeId, currentNotePath);
     }
 
-    function getSelectedNodes() {
-        return getTree().getSelectedNodes();
+    function getSelectedNodes(stopOnParents = false) {
+        return getTree().getSelectedNodes(stopOnParents);
     }
 
     function clearSelectedNodes() {
@@ -403,7 +411,7 @@ const noteTree = (function() {
 
         const keybindings = {
             "del": node => {
-                treeChanges.deleteNode(node);
+                treeChanges.deleteNodes(getSelectedNodes(true));
             },
             "ctrl+up": node => {
                 const beforeNode = node.getPrevSibling();
@@ -468,6 +476,11 @@ const noteTree = (function() {
             "alt+-": node => {
                 collapseTree(node);
             },
+            "alt+s": node => {
+                sortAlphabetically(node.data.note_id);
+
+                return false;
+            },
             "ctrl+a": node => {
                 for (const child of node.getParent().getChildren()) {
                     child.setSelected(true);
@@ -759,16 +772,32 @@ const noteTree = (function() {
         if (target === 'after') {
             node.appendSibling(newNode).setActive(true);
         }
-        else {
-            node.addChildren(newNode).setActive(true);
+        else if (target === 'into') {
+            if (!node.getChildren() && node.isFolder()) {
+                await node.setExpanded();
+            }
+            else {
+                node.addChildren(newNode);
+            }
+
+            node.getLastChild().setActive(true);
 
             node.folder = true;
             node.renderTitle();
         }
+        else {
+            throwError("Unrecognized target: " + target);
+        }
 
         showMessage("Created!");
     }
 
+    async function sortAlphabetically(noteId) {
+        await server.put('notes/' + noteId + '/sort');
+
+        await reload();
+    }
+
     $(document).bind('keydown', 'ctrl+o', e => {
         console.log("pressed O");
 
@@ -792,7 +821,7 @@ const noteTree = (function() {
     $(document).bind('keydown', 'ctrl+del', e => {
         const node = getCurrentNode();
 
-        treeChanges.deleteNode(node);
+        treeChanges.deleteNodes([node]);
 
         e.preventDefault();
     });
@@ -830,6 +859,7 @@ const noteTree = (function() {
         setNoteTreeBackgroundBasedOnProtectedStatus,
         setProtected,
         getCurrentNode,
+        expandToNote,
         activateNode,
         getCurrentNotePath,
         getNoteTitle,
@@ -842,6 +872,7 @@ const noteTree = (function() {
         getNotePathTitle,
         removeParentChildRelation,
         setParentChildRelation,
-        getSelectedNodes
+        getSelectedNodes,
+        sortAlphabetically
     };
 })();

public/javascripts/protected_session.js

@@ -142,7 +142,7 @@ const protected_session = (function() {
     async function protectSubTree(noteId, protect) {
         await ensureProtectedSession(true, true);
 
-        await server.put('tree/' + noteId + "/protect-sub-tree/" + (protect ? 1 : 0));
+        await server.put('notes/' + noteId + "/protect-sub-tree/" + (protect ? 1 : 0));
 
         showMessage("Request to un/protect sub tree has finished successfully");
 

public/javascripts/search_tree.js

@@ -30,7 +30,7 @@ const searchTree = (function() {
         return treeEl.fancytree('getTree');
     }
 
-    searchInputEl.keyup(e => {
+    searchInputEl.keyup(async e => {
         const searchText = searchInputEl.val();
 
         if (e && e.which === $.ui.keyCode.ESCAPE || $.trim(searchText) === "") {
@@ -39,16 +39,18 @@ const searchTree = (function() {
         }
 
         if (e && e.which === $.ui.keyCode.ENTER) {
-            server.get('notes?search=' + searchText).then(resp => {
-                // Pass a string to perform case insensitive matching
-                getTree().filterBranches(node => {
-                    return resp.includes(node.data.note_id);
-                });
-            });
+            const noteIds = await server.get('notes?search=' + encodeURIComponent(searchText));
+
+            for (const noteId of noteIds) {
+                await noteTree.expandToNote(noteId, {noAnimation: true, noEvents: true});
+            }
+
+            // Pass a string to perform case insensitive matching
+            getTree().filterBranches(node => noteIds.includes(node.data.note_id));
         }
     }).focus();
 
-    $(document).bind('keydown', 'alt+s', e => {
+    $(document).bind('keydown', 'ctrl+s', e => {
         toggleSearch();
 
         e.preventDefault();

public/javascripts/tree_changes.js

@@ -3,7 +3,7 @@
 const treeChanges = (function() {
     async function moveBeforeNode(nodesToMove, beforeNode) {
         for (const nodeToMove of nodesToMove) {
-            const resp = await server.put('notes/' + nodeToMove.data.note_tree_id + '/move-before/' + beforeNode.data.note_tree_id);
+            const resp = await server.put('tree/' + nodeToMove.data.note_tree_id + '/move-before/' + beforeNode.data.note_tree_id);
 
             if (!resp.success) {
                 alert(resp.message);
@@ -16,7 +16,7 @@ const treeChanges = (function() {
 
     async function moveAfterNode(nodesToMove, afterNode) {
         for (const nodeToMove of nodesToMove) {
-            const resp = await server.put('notes/' + nodeToMove.data.note_tree_id + '/move-after/' + afterNode.data.note_tree_id);
+            const resp = await server.put('tree/' + nodeToMove.data.note_tree_id + '/move-after/' + afterNode.data.note_tree_id);
 
             if (!resp.success) {
                 alert(resp.message);
@@ -27,21 +27,9 @@ const treeChanges = (function() {
         }
     }
 
-    // beware that first arg is noteId and second is noteTreeId!
-    async function cloneNoteAfter(noteId, afterNoteTreeId) {
-        const resp = await server.put('notes/' + noteId + '/clone-after/' + afterNoteTreeId);
-
-        if (!resp.success) {
-            alert(resp.message);
-            return;
-        }
-
-        await noteTree.reload();
-    }
-
     async function moveToNode(nodesToMove, toNode) {
         for (const nodeToMove of nodesToMove) {
-            const resp = await server.put('notes/' + nodeToMove.data.note_tree_id + '/move-to/' + toNode.data.note_id);
+            const resp = await server.put('tree/' + nodeToMove.data.note_tree_id + '/move-to/' + toNode.data.note_id);
 
             if (!resp.success) {
                 alert(resp.message);
@@ -65,43 +53,27 @@ const treeChanges = (function() {
         }
     }
 
-    async function cloneNoteTo(childNoteId, parentNoteId, prefix) {
-        const resp = await server.put('notes/' + childNoteId + '/clone-to/' + parentNoteId, {
-            prefix: prefix
-        });
-
-        if (!resp.success) {
-            alert(resp.message);
+    async function deleteNodes(nodes) {
+        if (nodes.length === 0 || !confirm('Are you sure you want to delete select note(s) and all the sub-notes?')) {
             return;
         }
 
-        await noteTree.reload();
-    }
-
-    async function deleteNode(node) {
-        if (!confirm('Are you sure you want to delete note "' + node.title + '" and all its sub-notes?')) {
-            return;
+        for (const node of nodes) {
+            await server.remove('tree/' + node.data.note_tree_id);
         }
 
-        await server.remove('notes/' + node.data.note_tree_id);
-
-        if (!isTopLevelNode(node) && node.getParent().getChildren().length <= 1) {
-            node.getParent().folder = false;
-            node.getParent().renderTitle();
-        }
-
-        let next = node.getNextSibling();
+        // following code assumes that nodes contain only top-most selected nodes - getSelectedNodes has been
+        // called with stopOnParent=true
+        let next = nodes[nodes.length - 1].getNextSibling();
 
         if (!next) {
-            next = node.getPrevSibling();
+            next = nodes[0].getPrevSibling();
         }
 
-        if (!next && !isTopLevelNode(node)) {
-            next = node.getParent();
+        if (!next && !isTopLevelNode(nodes[0])) {
+            next = nodes[0].getParent();
         }
 
-        node.remove();
-
         if (next) {
             // activate next element after this one is deleted so we don't lose focus
             next.setActive();
@@ -111,7 +83,7 @@ const treeChanges = (function() {
 
         noteTree.reload();
 
-        showMessage("Note has been deleted.");
+        showMessage("Note(s) has been deleted.");
     }
 
     async function moveNodeUpInHierarchy(node) {
@@ -119,7 +91,7 @@ const treeChanges = (function() {
             return;
         }
 
-        const resp = await server.put('notes/' + node.data.note_tree_id + '/move-after/' + node.getParent().data.note_tree_id);
+        const resp = await server.put('tree/' + node.data.note_tree_id + '/move-after/' + node.getParent().data.note_tree_id);
 
         if (!resp.success) {
             alert(resp.message);
@@ -152,9 +124,7 @@ const treeChanges = (function() {
         moveBeforeNode,
         moveAfterNode,
         moveToNode,
-        deleteNode,
-        moveNodeUpInHierarchy,
-        cloneNoteAfter,
-        cloneNoteTo
+        deleteNodes,
+        moveNodeUpInHierarchy
     };
 })();

public/libraries/knockout.min.js

@@ -0,0 +1,124 @@
+/*!
+ * Knockout JavaScript library v3.4.2
+ * (c) The Knockout.js team - http://knockoutjs.com/
+ * License: MIT (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+(function() {(function(n){var x=this||(0,eval)("this"),t=x.document,M=x.navigator,u=x.jQuery,H=x.JSON;(function(n){"function"===typeof define&&define.amd?define(["exports","require"],n):"object"===typeof exports&&"object"===typeof module?n(module.exports||exports):n(x.ko={})})(function(N,O){function J(a,c){return null===a||typeof a in R?a===c:!1}function S(b,c){var d;return function(){d||(d=a.a.setTimeout(function(){d=n;b()},c))}}function T(b,c){var d;return function(){clearTimeout(d);d=a.a.setTimeout(b,c)}}function U(a,
+c){c&&c!==E?"beforeChange"===c?this.Ob(a):this.Ja(a,c):this.Pb(a)}function V(a,c){null!==c&&c.k&&c.k()}function W(a,c){var d=this.Mc,e=d[s];e.T||(this.ob&&this.Oa[c]?(d.Sb(c,a,this.Oa[c]),this.Oa[c]=null,--this.ob):e.s[c]||d.Sb(c,a,e.t?{$:a}:d.yc(a)),a.Ha&&a.Hc())}function K(b,c,d,e){a.d[b]={init:function(b,g,h,l,m){var k,r;a.m(function(){var q=g(),p=a.a.c(q),p=!d!==!p,A=!r;if(A||c||p!==k)A&&a.xa.Ca()&&(r=a.a.wa(a.f.childNodes(b),!0)),p?(A||a.f.fa(b,a.a.wa(r)),a.hb(e?e(m,q):m,b)):a.f.za(b),k=p},null,
+{i:b});return{controlsDescendantBindings:!0}}};a.h.va[b]=!1;a.f.aa[b]=!0}var a="undefined"!==typeof N?N:{};a.b=function(b,c){for(var d=b.split("."),e=a,f=0;f<d.length-1;f++)e=e[d[f]];e[d[d.length-1]]=c};a.H=function(a,c,d){a[c]=d};a.version="3.4.2";a.b("version",a.version);a.options={deferUpdates:!1,useOnlyNativeEvents:!1};a.a=function(){function b(a,b){for(var c in a)a.hasOwnProperty(c)&&b(c,a[c])}function c(a,b){if(b)for(var c in b)b.hasOwnProperty(c)&&(a[c]=b[c]);return a}function d(a,b){a.__proto__=
+b;return a}function e(b,c,d,e){var m=b[c].match(r)||[];a.a.r(d.match(r),function(b){a.a.ra(m,b,e)});b[c]=m.join(" ")}var f={__proto__:[]}instanceof Array,g="function"===typeof Symbol,h={},l={};h[M&&/Firefox\/2/i.test(M.userAgent)?"KeyboardEvent":"UIEvents"]=["keyup","keydown","keypress"];h.MouseEvents="click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave".split(" ");b(h,function(a,b){if(b.length)for(var c=0,d=b.length;c<d;c++)l[b[c]]=a});var m={propertychange:!0},k=
+t&&function(){for(var a=3,b=t.createElement("div"),c=b.getElementsByTagName("i");b.innerHTML="\x3c!--[if gt IE "+ ++a+"]><i></i><![endif]--\x3e",c[0];);return 4<a?a:n}(),r=/\S+/g;return{gc:["authenticity_token",/^__RequestVerificationToken(_.*)?$/],r:function(a,b){for(var c=0,d=a.length;c<d;c++)b(a[c],c)},o:function(a,b){if("function"==typeof Array.prototype.indexOf)return Array.prototype.indexOf.call(a,b);for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},Vb:function(a,b,c){for(var d=
+0,e=a.length;d<e;d++)if(b.call(c,a[d],d))return a[d];return null},Na:function(b,c){var d=a.a.o(b,c);0<d?b.splice(d,1):0===d&&b.shift()},Wb:function(b){b=b||[];for(var c=[],d=0,e=b.length;d<e;d++)0>a.a.o(c,b[d])&&c.push(b[d]);return c},ib:function(a,b){a=a||[];for(var c=[],d=0,e=a.length;d<e;d++)c.push(b(a[d],d));return c},Ma:function(a,b){a=a||[];for(var c=[],d=0,e=a.length;d<e;d++)b(a[d],d)&&c.push(a[d]);return c},ta:function(a,b){if(b instanceof Array)a.push.apply(a,b);else for(var c=0,d=b.length;c<
+d;c++)a.push(b[c]);return a},ra:function(b,c,d){var e=a.a.o(a.a.Bb(b),c);0>e?d&&b.push(c):d||b.splice(e,1)},la:f,extend:c,$a:d,ab:f?d:c,D:b,Ea:function(a,b){if(!a)return a;var c={},d;for(d in a)a.hasOwnProperty(d)&&(c[d]=b(a[d],d,a));return c},rb:function(b){for(;b.firstChild;)a.removeNode(b.firstChild)},nc:function(b){b=a.a.W(b);for(var c=(b[0]&&b[0].ownerDocument||t).createElement("div"),d=0,e=b.length;d<e;d++)c.appendChild(a.ba(b[d]));return c},wa:function(b,c){for(var d=0,e=b.length,m=[];d<e;d++){var k=
+b[d].cloneNode(!0);m.push(c?a.ba(k):k)}return m},fa:function(b,c){a.a.rb(b);if(c)for(var d=0,e=c.length;d<e;d++)b.appendChild(c[d])},uc:function(b,c){var d=b.nodeType?[b]:b;if(0<d.length){for(var e=d[0],m=e.parentNode,k=0,f=c.length;k<f;k++)m.insertBefore(c[k],e);k=0;for(f=d.length;k<f;k++)a.removeNode(d[k])}},Ba:function(a,b){if(a.length){for(b=8===b.nodeType&&b.parentNode||b;a.length&&a[0].parentNode!==b;)a.splice(0,1);for(;1<a.length&&a[a.length-1].parentNode!==b;)a.length--;if(1<a.length){var c=
+a[0],d=a[a.length-1];for(a.length=0;c!==d;)a.push(c),c=c.nextSibling;a.push(d)}}return a},wc:function(a,b){7>k?a.setAttribute("selected",b):a.selected=b},cb:function(a){return null===a||a===n?"":a.trim?a.trim():a.toString().replace(/^[\s\xa0]+|[\s\xa0]+$/g,"")},sd:function(a,b){a=a||"";return b.length>a.length?!1:a.substring(0,b.length)===b},Rc:function(a,b){if(a===b)return!0;if(11===a.nodeType)return!1;if(b.contains)return b.contains(3===a.nodeType?a.parentNode:a);if(b.compareDocumentPosition)return 16==
+(b.compareDocumentPosition(a)&16);for(;a&&a!=b;)a=a.parentNode;return!!a},qb:function(b){return a.a.Rc(b,b.ownerDocument.documentElement)},Tb:function(b){return!!a.a.Vb(b,a.a.qb)},A:function(a){return a&&a.tagName&&a.tagName.toLowerCase()},Zb:function(b){return a.onError?function(){try{return b.apply(this,arguments)}catch(c){throw a.onError&&a.onError(c),c;}}:b},setTimeout:function(b,c){return setTimeout(a.a.Zb(b),c)},dc:function(b){setTimeout(function(){a.onError&&a.onError(b);throw b;},0)},q:function(b,
+c,d){var e=a.a.Zb(d);d=k&&m[c];if(a.options.useOnlyNativeEvents||d||!u)if(d||"function"!=typeof b.addEventListener)if("undefined"!=typeof b.attachEvent){var f=function(a){e.call(b,a)},l="on"+c;b.attachEvent(l,f);a.a.G.qa(b,function(){b.detachEvent(l,f)})}else throw Error("Browser doesn't support addEventListener or attachEvent");else b.addEventListener(c,e,!1);else u(b).bind(c,e)},Fa:function(b,c){if(!b||!b.nodeType)throw Error("element must be a DOM node when calling triggerEvent");var d;"input"===
+a.a.A(b)&&b.type&&"click"==c.toLowerCase()?(d=b.type,d="checkbox"==d||"radio"==d):d=!1;if(a.options.useOnlyNativeEvents||!u||d)if("function"==typeof t.createEvent)if("function"==typeof b.dispatchEvent)d=t.createEvent(l[c]||"HTMLEvents"),d.initEvent(c,!0,!0,x,0,0,0,0,0,!1,!1,!1,!1,0,b),b.dispatchEvent(d);else throw Error("The supplied element doesn't support dispatchEvent");else if(d&&b.click)b.click();else if("undefined"!=typeof b.fireEvent)b.fireEvent("on"+c);else throw Error("Browser doesn't support triggering events");
+else u(b).trigger(c)},c:function(b){return a.I(b)?b():b},Bb:function(b){return a.I(b)?b.p():b},fb:function(b,c,d){var k;c&&("object"===typeof b.classList?(k=b.classList[d?"add":"remove"],a.a.r(c.match(r),function(a){k.call(b.classList,a)})):"string"===typeof b.className.baseVal?e(b.className,"baseVal",c,d):e(b,"className",c,d))},bb:function(b,c){var d=a.a.c(c);if(null===d||d===n)d="";var e=a.f.firstChild(b);!e||3!=e.nodeType||a.f.nextSibling(e)?a.f.fa(b,[b.ownerDocument.createTextNode(d)]):e.data=
+d;a.a.Wc(b)},vc:function(a,b){a.name=b;if(7>=k)try{a.mergeAttributes(t.createElement("<input name='"+a.name+"'/>"),!1)}catch(c){}},Wc:function(a){9<=k&&(a=1==a.nodeType?a:a.parentNode,a.style&&(a.style.zoom=a.style.zoom))},Sc:function(a){if(k){var b=a.style.width;a.style.width=0;a.style.width=b}},nd:function(b,c){b=a.a.c(b);c=a.a.c(c);for(var d=[],e=b;e<=c;e++)d.push(e);return d},W:function(a){for(var b=[],c=0,d=a.length;c<d;c++)b.push(a[c]);return b},bc:function(a){return g?Symbol(a):a},xd:6===k,
+yd:7===k,C:k,ic:function(b,c){for(var d=a.a.W(b.getElementsByTagName("input")).concat(a.a.W(b.getElementsByTagName("textarea"))),e="string"==typeof c?function(a){return a.name===c}:function(a){return c.test(a.name)},k=[],m=d.length-1;0<=m;m--)e(d[m])&&k.push(d[m]);return k},kd:function(b){return"string"==typeof b&&(b=a.a.cb(b))?H&&H.parse?H.parse(b):(new Function("return "+b))():null},Gb:function(b,c,d){if(!H||!H.stringify)throw Error("Cannot find JSON.stringify(). Some browsers (e.g., IE < 8) don't support it natively, but you can overcome this by adding a script reference to json2.js, downloadable from http://www.json.org/json2.js");
+return H.stringify(a.a.c(b),c,d)},ld:function(c,d,e){e=e||{};var k=e.params||{},m=e.includeFields||this.gc,f=c;if("object"==typeof c&&"form"===a.a.A(c))for(var f=c.action,l=m.length-1;0<=l;l--)for(var g=a.a.ic(c,m[l]),h=g.length-1;0<=h;h--)k[g[h].name]=g[h].value;d=a.a.c(d);var r=t.createElement("form");r.style.display="none";r.action=f;r.method="post";for(var n in d)c=t.createElement("input"),c.type="hidden",c.name=n,c.value=a.a.Gb(a.a.c(d[n])),r.appendChild(c);b(k,function(a,b){var c=t.createElement("input");
+c.type="hidden";c.name=a;c.value=b;r.appendChild(c)});t.body.appendChild(r);e.submitter?e.submitter(r):r.submit();setTimeout(function(){r.parentNode.removeChild(r)},0)}}}();a.b("utils",a.a);a.b("utils.arrayForEach",a.a.r);a.b("utils.arrayFirst",a.a.Vb);a.b("utils.arrayFilter",a.a.Ma);a.b("utils.arrayGetDistinctValues",a.a.Wb);a.b("utils.arrayIndexOf",a.a.o);a.b("utils.arrayMap",a.a.ib);a.b("utils.arrayPushAll",a.a.ta);a.b("utils.arrayRemoveItem",a.a.Na);a.b("utils.extend",a.a.extend);a.b("utils.fieldsIncludedWithJsonPost",
+a.a.gc);a.b("utils.getFormFields",a.a.ic);a.b("utils.peekObservable",a.a.Bb);a.b("utils.postJson",a.a.ld);a.b("utils.parseJson",a.a.kd);a.b("utils.registerEventHandler",a.a.q);a.b("utils.stringifyJson",a.a.Gb);a.b("utils.range",a.a.nd);a.b("utils.toggleDomNodeCssClass",a.a.fb);a.b("utils.triggerEvent",a.a.Fa);a.b("utils.unwrapObservable",a.a.c);a.b("utils.objectForEach",a.a.D);a.b("utils.addOrRemoveItem",a.a.ra);a.b("utils.setTextContent",a.a.bb);a.b("unwrap",a.a.c);Function.prototype.bind||(Function.prototype.bind=
+function(a){var c=this;if(1===arguments.length)return function(){return c.apply(a,arguments)};var d=Array.prototype.slice.call(arguments,1);return function(){var e=d.slice(0);e.push.apply(e,arguments);return c.apply(a,e)}});a.a.e=new function(){function a(b,g){var h=b[d];if(!h||"null"===h||!e[h]){if(!g)return n;h=b[d]="ko"+c++;e[h]={}}return e[h]}var c=0,d="__ko__"+(new Date).getTime(),e={};return{get:function(c,d){var e=a(c,!1);return e===n?n:e[d]},set:function(c,d,e){if(e!==n||a(c,!1)!==n)a(c,!0)[d]=
+e},clear:function(a){var b=a[d];return b?(delete e[b],a[d]=null,!0):!1},J:function(){return c++ +d}}};a.b("utils.domData",a.a.e);a.b("utils.domData.clear",a.a.e.clear);a.a.G=new function(){function b(b,c){var e=a.a.e.get(b,d);e===n&&c&&(e=[],a.a.e.set(b,d,e));return e}function c(d){var e=b(d,!1);if(e)for(var e=e.slice(0),l=0;l<e.length;l++)e[l](d);a.a.e.clear(d);a.a.G.cleanExternalData(d);if(f[d.nodeType])for(e=d.firstChild;d=e;)e=d.nextSibling,8===d.nodeType&&c(d)}var d=a.a.e.J(),e={1:!0,8:!0,9:!0},
+f={1:!0,9:!0};return{qa:function(a,c){if("function"!=typeof c)throw Error("Callback must be a function");b(a,!0).push(c)},tc:function(c,e){var f=b(c,!1);f&&(a.a.Na(f,e),0==f.length&&a.a.e.set(c,d,n))},ba:function(b){if(e[b.nodeType]&&(c(b),f[b.nodeType])){var d=[];a.a.ta(d,b.getElementsByTagName("*"));for(var l=0,m=d.length;l<m;l++)c(d[l])}return b},removeNode:function(b){a.ba(b);b.parentNode&&b.parentNode.removeChild(b)},cleanExternalData:function(a){u&&"function"==typeof u.cleanData&&u.cleanData([a])}}};
+a.ba=a.a.G.ba;a.removeNode=a.a.G.removeNode;a.b("cleanNode",a.ba);a.b("removeNode",a.removeNode);a.b("utils.domNodeDisposal",a.a.G);a.b("utils.domNodeDisposal.addDisposeCallback",a.a.G.qa);a.b("utils.domNodeDisposal.removeDisposeCallback",a.a.G.tc);(function(){var b=[0,"",""],c=[1,"<table>","</table>"],d=[3,"<table><tbody><tr>","</tr></tbody></table>"],e=[1,"<select multiple='multiple'>","</select>"],f={thead:c,tbody:c,tfoot:c,tr:[2,"<table><tbody>","</tbody></table>"],td:d,th:d,option:e,optgroup:e},
+g=8>=a.a.C;a.a.na=function(c,d){var e;if(u)if(u.parseHTML)e=u.parseHTML(c,d)||[];else{if((e=u.clean([c],d))&&e[0]){for(var k=e[0];k.parentNode&&11!==k.parentNode.nodeType;)k=k.parentNode;k.parentNode&&k.parentNode.removeChild(k)}}else{(e=d)||(e=t);var k=e.parentWindow||e.defaultView||x,r=a.a.cb(c).toLowerCase(),q=e.createElement("div"),p;p=(r=r.match(/^<([a-z]+)[ >]/))&&f[r[1]]||b;r=p[0];p="ignored<div>"+p[1]+c+p[2]+"</div>";"function"==typeof k.innerShiv?q.appendChild(k.innerShiv(p)):(g&&e.appendChild(q),
+q.innerHTML=p,g&&q.parentNode.removeChild(q));for(;r--;)q=q.lastChild;e=a.a.W(q.lastChild.childNodes)}return e};a.a.Eb=function(b,c){a.a.rb(b);c=a.a.c(c);if(null!==c&&c!==n)if("string"!=typeof c&&(c=c.toString()),u)u(b).html(c);else for(var d=a.a.na(c,b.ownerDocument),e=0;e<d.length;e++)b.appendChild(d[e])}})();a.b("utils.parseHtmlFragment",a.a.na);a.b("utils.setHtml",a.a.Eb);a.N=function(){function b(c,e){if(c)if(8==c.nodeType){var f=a.N.pc(c.nodeValue);null!=f&&e.push({Qc:c,hd:f})}else if(1==c.nodeType)for(var f=
+0,g=c.childNodes,h=g.length;f<h;f++)b(g[f],e)}var c={};return{yb:function(a){if("function"!=typeof a)throw Error("You can only pass a function to ko.memoization.memoize()");var b=(4294967296*(1+Math.random())|0).toString(16).substring(1)+(4294967296*(1+Math.random())|0).toString(16).substring(1);c[b]=a;return"\x3c!--[ko_memo:"+b+"]--\x3e"},Bc:function(a,b){var f=c[a];if(f===n)throw Error("Couldn't find any memo with ID "+a+". Perhaps it's already been unmemoized.");try{return f.apply(null,b||[]),
+!0}finally{delete c[a]}},Cc:function(c,e){var f=[];b(c,f);for(var g=0,h=f.length;g<h;g++){var l=f[g].Qc,m=[l];e&&a.a.ta(m,e);a.N.Bc(f[g].hd,m);l.nodeValue="";l.parentNode&&l.parentNode.removeChild(l)}},pc:function(a){return(a=a.match(/^\[ko_memo\:(.*?)\]$/))?a[1]:null}}}();a.b("memoization",a.N);a.b("memoization.memoize",a.N.yb);a.b("memoization.unmemoize",a.N.Bc);a.b("memoization.parseMemoText",a.N.pc);a.b("memoization.unmemoizeDomNodeAndDescendants",a.N.Cc);a.Z=function(){function b(){if(e)for(var b=
+e,c=0,m;g<e;)if(m=d[g++]){if(g>b){if(5E3<=++c){g=e;a.a.dc(Error("'Too much recursion' after processing "+c+" task groups."));break}b=e}try{m()}catch(k){a.a.dc(k)}}}function c(){b();g=e=d.length=0}var d=[],e=0,f=1,g=0;return{scheduler:x.MutationObserver?function(a){var b=t.createElement("div");(new MutationObserver(a)).observe(b,{attributes:!0});return function(){b.classList.toggle("foo")}}(c):t&&"onreadystatechange"in t.createElement("script")?function(a){var b=t.createElement("script");b.onreadystatechange=
+function(){b.onreadystatechange=null;t.documentElement.removeChild(b);b=null;a()};t.documentElement.appendChild(b)}:function(a){setTimeout(a,0)},Za:function(b){e||a.Z.scheduler(c);d[e++]=b;return f++},cancel:function(a){a-=f-e;a>=g&&a<e&&(d[a]=null)},resetForTesting:function(){var a=e-g;g=e=d.length=0;return a},rd:b}}();a.b("tasks",a.Z);a.b("tasks.schedule",a.Z.Za);a.b("tasks.runEarly",a.Z.rd);a.Aa={throttle:function(b,c){b.throttleEvaluation=c;var d=null;return a.B({read:b,write:function(e){clearTimeout(d);
+d=a.a.setTimeout(function(){b(e)},c)}})},rateLimit:function(a,c){var d,e,f;"number"==typeof c?d=c:(d=c.timeout,e=c.method);a.gb=!1;f="notifyWhenChangesStop"==e?T:S;a.Wa(function(a){return f(a,d)})},deferred:function(b,c){if(!0!==c)throw Error("The 'deferred' extender only accepts the value 'true', because it is not supported to turn deferral off once enabled.");b.gb||(b.gb=!0,b.Wa(function(c){var e,f=!1;return function(){if(!f){a.Z.cancel(e);e=a.Z.Za(c);try{f=!0,b.notifySubscribers(n,"dirty")}finally{f=
+!1}}}}))},notify:function(a,c){a.equalityComparer="always"==c?null:J}};var R={undefined:1,"boolean":1,number:1,string:1};a.b("extenders",a.Aa);a.zc=function(b,c,d){this.$=b;this.jb=c;this.Pc=d;this.T=!1;a.H(this,"dispose",this.k)};a.zc.prototype.k=function(){this.T=!0;this.Pc()};a.K=function(){a.a.ab(this,D);D.ub(this)};var E="change",D={ub:function(a){a.F={change:[]};a.Qb=1},Y:function(b,c,d){var e=this;d=d||E;var f=new a.zc(e,c?b.bind(c):b,function(){a.a.Na(e.F[d],f);e.Ka&&e.Ka(d)});e.ua&&e.ua(d);
+e.F[d]||(e.F[d]=[]);e.F[d].push(f);return f},notifySubscribers:function(b,c){c=c||E;c===E&&this.Kb();if(this.Ra(c)){var d=c===E&&this.Fc||this.F[c].slice(0);try{a.l.Xb();for(var e=0,f;f=d[e];++e)f.T||f.jb(b)}finally{a.l.end()}}},Pa:function(){return this.Qb},Zc:function(a){return this.Pa()!==a},Kb:function(){++this.Qb},Wa:function(b){var c=this,d=a.I(c),e,f,g,h;c.Ja||(c.Ja=c.notifySubscribers,c.notifySubscribers=U);var l=b(function(){c.Ha=!1;d&&h===c&&(h=c.Mb?c.Mb():c());var a=f||c.Ua(g,h);f=e=!1;
+a&&c.Ja(g=h)});c.Pb=function(a){c.Fc=c.F[E].slice(0);c.Ha=e=!0;h=a;l()};c.Ob=function(a){e||(g=a,c.Ja(a,"beforeChange"))};c.Hc=function(){c.Ua(g,c.p(!0))&&(f=!0)}},Ra:function(a){return this.F[a]&&this.F[a].length},Xc:function(b){if(b)return this.F[b]&&this.F[b].length||0;var c=0;a.a.D(this.F,function(a,b){"dirty"!==a&&(c+=b.length)});return c},Ua:function(a,c){return!this.equalityComparer||!this.equalityComparer(a,c)},extend:function(b){var c=this;b&&a.a.D(b,function(b,e){var f=a.Aa[b];"function"==
+typeof f&&(c=f(c,e)||c)});return c}};a.H(D,"subscribe",D.Y);a.H(D,"extend",D.extend);a.H(D,"getSubscriptionsCount",D.Xc);a.a.la&&a.a.$a(D,Function.prototype);a.K.fn=D;a.lc=function(a){return null!=a&&"function"==typeof a.Y&&"function"==typeof a.notifySubscribers};a.b("subscribable",a.K);a.b("isSubscribable",a.lc);a.xa=a.l=function(){function b(a){d.push(e);e=a}function c(){e=d.pop()}var d=[],e,f=0;return{Xb:b,end:c,sc:function(b){if(e){if(!a.lc(b))throw Error("Only subscribable things can act as dependencies");
+e.jb.call(e.Lc,b,b.Gc||(b.Gc=++f))}},w:function(a,d,e){try{return b(),a.apply(d,e||[])}finally{c()}},Ca:function(){if(e)return e.m.Ca()},Va:function(){if(e)return e.Va}}}();a.b("computedContext",a.xa);a.b("computedContext.getDependenciesCount",a.xa.Ca);a.b("computedContext.isInitial",a.xa.Va);a.b("ignoreDependencies",a.wd=a.l.w);var F=a.a.bc("_latestValue");a.O=function(b){function c(){if(0<arguments.length)return c.Ua(c[F],arguments[0])&&(c.ia(),c[F]=arguments[0],c.ha()),this;a.l.sc(c);return c[F]}
+c[F]=b;a.a.la||a.a.extend(c,a.K.fn);a.K.fn.ub(c);a.a.ab(c,B);a.options.deferUpdates&&a.Aa.deferred(c,!0);return c};var B={equalityComparer:J,p:function(){return this[F]},ha:function(){this.notifySubscribers(this[F])},ia:function(){this.notifySubscribers(this[F],"beforeChange")}};a.a.la&&a.a.$a(B,a.K.fn);var I=a.O.md="__ko_proto__";B[I]=a.O;a.Qa=function(b,c){return null===b||b===n||b[I]===n?!1:b[I]===c?!0:a.Qa(b[I],c)};a.I=function(b){return a.Qa(b,a.O)};a.Da=function(b){return"function"==typeof b&&
+b[I]===a.O||"function"==typeof b&&b[I]===a.B&&b.$c?!0:!1};a.b("observable",a.O);a.b("isObservable",a.I);a.b("isWriteableObservable",a.Da);a.b("isWritableObservable",a.Da);a.b("observable.fn",B);a.H(B,"peek",B.p);a.H(B,"valueHasMutated",B.ha);a.H(B,"valueWillMutate",B.ia);a.ma=function(b){b=b||[];if("object"!=typeof b||!("length"in b))throw Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");b=a.O(b);a.a.ab(b,a.ma.fn);return b.extend({trackArrayChanges:!0})};
+a.ma.fn={remove:function(b){for(var c=this.p(),d=[],e="function"!=typeof b||a.I(b)?function(a){return a===b}:b,f=0;f<c.length;f++){var g=c[f];e(g)&&(0===d.length&&this.ia(),d.push(g),c.splice(f,1),f--)}d.length&&this.ha();return d},removeAll:function(b){if(b===n){var c=this.p(),d=c.slice(0);this.ia();c.splice(0,c.length);this.ha();return d}return b?this.remove(function(c){return 0<=a.a.o(b,c)}):[]},destroy:function(b){var c=this.p(),d="function"!=typeof b||a.I(b)?function(a){return a===b}:b;this.ia();
+for(var e=c.length-1;0<=e;e--)d(c[e])&&(c[e]._destroy=!0);this.ha()},destroyAll:function(b){return b===n?this.destroy(function(){return!0}):b?this.destroy(function(c){return 0<=a.a.o(b,c)}):[]},indexOf:function(b){var c=this();return a.a.o(c,b)},replace:function(a,c){var d=this.indexOf(a);0<=d&&(this.ia(),this.p()[d]=c,this.ha())}};a.a.la&&a.a.$a(a.ma.fn,a.O.fn);a.a.r("pop push reverse shift sort splice unshift".split(" "),function(b){a.ma.fn[b]=function(){var a=this.p();this.ia();this.Yb(a,b,arguments);
+var d=a[b].apply(a,arguments);this.ha();return d===a?this:d}});a.a.r(["slice"],function(b){a.ma.fn[b]=function(){var a=this();return a[b].apply(a,arguments)}});a.b("observableArray",a.ma);a.Aa.trackArrayChanges=function(b,c){function d(){if(!e){e=!0;l=b.notifySubscribers;b.notifySubscribers=function(a,b){b&&b!==E||++h;return l.apply(this,arguments)};var c=[].concat(b.p()||[]);f=null;g=b.Y(function(d){d=[].concat(d||[]);if(b.Ra("arrayChange")){var e;if(!f||1<h)f=a.a.lb(c,d,b.kb);e=f}c=d;f=null;h=0;
+e&&e.length&&b.notifySubscribers(e,"arrayChange")})}}b.kb={};c&&"object"==typeof c&&a.a.extend(b.kb,c);b.kb.sparse=!0;if(!b.Yb){var e=!1,f=null,g,h=0,l,m=b.ua,k=b.Ka;b.ua=function(a){m&&m.call(b,a);"arrayChange"===a&&d()};b.Ka=function(a){k&&k.call(b,a);"arrayChange"!==a||b.Ra("arrayChange")||(l&&(b.notifySubscribers=l,l=n),g.k(),e=!1)};b.Yb=function(b,c,d){function k(a,b,c){return m[m.length]={status:a,value:b,index:c}}if(e&&!h){var m=[],l=b.length,g=d.length,G=0;switch(c){case "push":G=l;case "unshift":for(c=
+0;c<g;c++)k("added",d[c],G+c);break;case "pop":G=l-1;case "shift":l&&k("deleted",b[G],G);break;case "splice":c=Math.min(Math.max(0,0>d[0]?l+d[0]:d[0]),l);for(var l=1===g?l:Math.min(c+(d[1]||0),l),g=c+g-2,G=Math.max(l,g),n=[],s=[],w=2;c<G;++c,++w)c<l&&s.push(k("deleted",b[c],c)),c<g&&n.push(k("added",d[w],c));a.a.hc(s,n);break;default:return}f=m}}}};var s=a.a.bc("_state");a.m=a.B=function(b,c,d){function e(){if(0<arguments.length){if("function"===typeof f)f.apply(g.sb,arguments);else throw Error("Cannot write a value to a ko.computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters.");
+return this}a.l.sc(e);(g.V||g.t&&e.Sa())&&e.U();return g.M}"object"===typeof b?d=b:(d=d||{},b&&(d.read=b));if("function"!=typeof d.read)throw Error("Pass a function that returns the value of the ko.computed");var f=d.write,g={M:n,da:!0,V:!0,Ta:!1,Hb:!1,T:!1,Ya:!1,t:!1,od:d.read,sb:c||d.owner,i:d.disposeWhenNodeIsRemoved||d.i||null,ya:d.disposeWhen||d.ya,pb:null,s:{},L:0,fc:null};e[s]=g;e.$c="function"===typeof f;a.a.la||a.a.extend(e,a.K.fn);a.K.fn.ub(e);a.a.ab(e,z);d.pure?(g.Ya=!0,g.t=!0,a.a.extend(e,
+Y)):d.deferEvaluation&&a.a.extend(e,Z);a.options.deferUpdates&&a.Aa.deferred(e,!0);g.i&&(g.Hb=!0,g.i.nodeType||(g.i=null));g.t||d.deferEvaluation||e.U();g.i&&e.ca()&&a.a.G.qa(g.i,g.pb=function(){e.k()});return e};var z={equalityComparer:J,Ca:function(){return this[s].L},Sb:function(a,c,d){if(this[s].Ya&&c===this)throw Error("A 'pure' computed must not be called recursively");this[s].s[a]=d;d.Ia=this[s].L++;d.pa=c.Pa()},Sa:function(){var a,c,d=this[s].s;for(a in d)if(d.hasOwnProperty(a)&&(c=d[a],this.oa&&
+c.$.Ha||c.$.Zc(c.pa)))return!0},gd:function(){this.oa&&!this[s].Ta&&this.oa(!1)},ca:function(){var a=this[s];return a.V||0<a.L},qd:function(){this.Ha?this[s].V&&(this[s].da=!0):this.ec()},yc:function(a){if(a.gb&&!this[s].i){var c=a.Y(this.gd,this,"dirty"),d=a.Y(this.qd,this);return{$:a,k:function(){c.k();d.k()}}}return a.Y(this.ec,this)},ec:function(){var b=this,c=b.throttleEvaluation;c&&0<=c?(clearTimeout(this[s].fc),this[s].fc=a.a.setTimeout(function(){b.U(!0)},c)):b.oa?b.oa(!0):b.U(!0)},U:function(b){var c=
+this[s],d=c.ya,e=!1;if(!c.Ta&&!c.T){if(c.i&&!a.a.qb(c.i)||d&&d()){if(!c.Hb){this.k();return}}else c.Hb=!1;c.Ta=!0;try{e=this.Vc(b)}finally{c.Ta=!1}c.L||this.k();return e}},Vc:function(b){var c=this[s],d=!1,e=c.Ya?n:!c.L,f={Mc:this,Oa:c.s,ob:c.L};a.l.Xb({Lc:f,jb:W,m:this,Va:e});c.s={};c.L=0;f=this.Uc(c,f);this.Ua(c.M,f)&&(c.t||this.notifySubscribers(c.M,"beforeChange"),c.M=f,c.t?this.Kb():b&&this.notifySubscribers(c.M),d=!0);e&&this.notifySubscribers(c.M,"awake");return d},Uc:function(b,c){try{var d=
+b.od;return b.sb?d.call(b.sb):d()}finally{a.l.end(),c.ob&&!b.t&&a.a.D(c.Oa,V),b.da=b.V=!1}},p:function(a){var c=this[s];(c.V&&(a||!c.L)||c.t&&this.Sa())&&this.U();return c.M},Wa:function(b){a.K.fn.Wa.call(this,b);this.Mb=function(){this[s].da?this.U():this[s].V=!1;return this[s].M};this.oa=function(a){this.Ob(this[s].M);this[s].V=!0;a&&(this[s].da=!0);this.Pb(this)}},k:function(){var b=this[s];!b.t&&b.s&&a.a.D(b.s,function(a,b){b.k&&b.k()});b.i&&b.pb&&a.a.G.tc(b.i,b.pb);b.s=null;b.L=0;b.T=!0;b.da=
+!1;b.V=!1;b.t=!1;b.i=null}},Y={ua:function(b){var c=this,d=c[s];if(!d.T&&d.t&&"change"==b){d.t=!1;if(d.da||c.Sa())d.s=null,d.L=0,c.U()&&c.Kb();else{var e=[];a.a.D(d.s,function(a,b){e[b.Ia]=a});a.a.r(e,function(a,b){var e=d.s[a],l=c.yc(e.$);l.Ia=b;l.pa=e.pa;d.s[a]=l})}d.T||c.notifySubscribers(d.M,"awake")}},Ka:function(b){var c=this[s];c.T||"change"!=b||this.Ra("change")||(a.a.D(c.s,function(a,b){b.k&&(c.s[a]={$:b.$,Ia:b.Ia,pa:b.pa},b.k())}),c.t=!0,this.notifySubscribers(n,"asleep"))},Pa:function(){var b=
+this[s];b.t&&(b.da||this.Sa())&&this.U();return a.K.fn.Pa.call(this)}},Z={ua:function(a){"change"!=a&&"beforeChange"!=a||this.p()}};a.a.la&&a.a.$a(z,a.K.fn);var P=a.O.md;a.m[P]=a.O;z[P]=a.m;a.bd=function(b){return a.Qa(b,a.m)};a.cd=function(b){return a.Qa(b,a.m)&&b[s]&&b[s].Ya};a.b("computed",a.m);a.b("dependentObservable",a.m);a.b("isComputed",a.bd);a.b("isPureComputed",a.cd);a.b("computed.fn",z);a.H(z,"peek",z.p);a.H(z,"dispose",z.k);a.H(z,"isActive",z.ca);a.H(z,"getDependenciesCount",z.Ca);a.rc=
+function(b,c){if("function"===typeof b)return a.m(b,c,{pure:!0});b=a.a.extend({},b);b.pure=!0;return a.m(b,c)};a.b("pureComputed",a.rc);(function(){function b(a,f,g){g=g||new d;a=f(a);if("object"!=typeof a||null===a||a===n||a instanceof RegExp||a instanceof Date||a instanceof String||a instanceof Number||a instanceof Boolean)return a;var h=a instanceof Array?[]:{};g.save(a,h);c(a,function(c){var d=f(a[c]);switch(typeof d){case "boolean":case "number":case "string":case "function":h[c]=d;break;case "object":case "undefined":var k=
+g.get(d);h[c]=k!==n?k:b(d,f,g)}});return h}function c(a,b){if(a instanceof Array){for(var c=0;c<a.length;c++)b(c);"function"==typeof a.toJSON&&b("toJSON")}else for(c in a)b(c)}function d(){this.keys=[];this.Lb=[]}a.Ac=function(c){if(0==arguments.length)throw Error("When calling ko.toJS, pass the object you want to convert.");return b(c,function(b){for(var c=0;a.I(b)&&10>c;c++)b=b();return b})};a.toJSON=function(b,c,d){b=a.Ac(b);return a.a.Gb(b,c,d)};d.prototype={save:function(b,c){var d=a.a.o(this.keys,
+b);0<=d?this.Lb[d]=c:(this.keys.push(b),this.Lb.push(c))},get:function(b){b=a.a.o(this.keys,b);return 0<=b?this.Lb[b]:n}}})();a.b("toJS",a.Ac);a.b("toJSON",a.toJSON);(function(){a.j={u:function(b){switch(a.a.A(b)){case "option":return!0===b.__ko__hasDomDataOptionValue__?a.a.e.get(b,a.d.options.zb):7>=a.a.C?b.getAttributeNode("value")&&b.getAttributeNode("value").specified?b.value:b.text:b.value;case "select":return 0<=b.selectedIndex?a.j.u(b.options[b.selectedIndex]):n;default:return b.value}},ja:function(b,
+c,d){switch(a.a.A(b)){case "option":switch(typeof c){case "string":a.a.e.set(b,a.d.options.zb,n);"__ko__hasDomDataOptionValue__"in b&&delete b.__ko__hasDomDataOptionValue__;b.value=c;break;default:a.a.e.set(b,a.d.options.zb,c),b.__ko__hasDomDataOptionValue__=!0,b.value="number"===typeof c?c:""}break;case "select":if(""===c||null===c)c=n;for(var e=-1,f=0,g=b.options.length,h;f<g;++f)if(h=a.j.u(b.options[f]),h==c||""==h&&c===n){e=f;break}if(d||0<=e||c===n&&1<b.size)b.selectedIndex=e;break;default:if(null===
+c||c===n)c="";b.value=c}}}})();a.b("selectExtensions",a.j);a.b("selectExtensions.readValue",a.j.u);a.b("selectExtensions.writeValue",a.j.ja);a.h=function(){function b(b){b=a.a.cb(b);123===b.charCodeAt(0)&&(b=b.slice(1,-1));var c=[],d=b.match(e),r,h=[],p=0;if(d){d.push(",");for(var A=0,y;y=d[A];++A){var v=y.charCodeAt(0);if(44===v){if(0>=p){c.push(r&&h.length?{key:r,value:h.join("")}:{unknown:r||h.join("")});r=p=0;h=[];continue}}else if(58===v){if(!p&&!r&&1===h.length){r=h.pop();continue}}else 47===
+v&&A&&1<y.length?(v=d[A-1].match(f))&&!g[v[0]]&&(b=b.substr(b.indexOf(y)+1),d=b.match(e),d.push(","),A=-1,y="/"):40===v||123===v||91===v?++p:41===v||125===v||93===v?--p:r||h.length||34!==v&&39!==v||(y=y.slice(1,-1));h.push(y)}}return c}var c=["true","false","null","undefined"],d=/^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i,e=RegExp("\"(?:[^\"\\\\]|\\\\.)*\"|'(?:[^'\\\\]|\\\\.)*'|/(?:[^/\\\\]|\\\\.)*/w*|[^\\s:,/][^,\"'{}()/:[\\]]*[^\\s,\"'{}()/:[\\]]|[^\\s]","g"),f=/[\])"'A-Za-z0-9_$]+$/,
+g={"in":1,"return":1,"typeof":1},h={};return{va:[],ga:h,Ab:b,Xa:function(e,m){function k(b,e){var m;if(!A){var l=a.getBindingHandler(b);if(l&&l.preprocess&&!(e=l.preprocess(e,b,k)))return;if(l=h[b])m=e,0<=a.a.o(c,m)?m=!1:(l=m.match(d),m=null===l?!1:l[1]?"Object("+l[1]+")"+l[2]:m),l=m;l&&g.push("'"+b+"':function(_z){"+m+"=_z}")}p&&(e="function(){return "+e+" }");f.push("'"+b+"':"+e)}m=m||{};var f=[],g=[],p=m.valueAccessors,A=m.bindingParams,y="string"===typeof e?b(e):e;a.a.r(y,function(a){k(a.key||
+a.unknown,a.value)});g.length&&k("_ko_property_writers","{"+g.join(",")+" }");return f.join(",")},fd:function(a,b){for(var c=0;c<a.length;c++)if(a[c].key==b)return!0;return!1},Ga:function(b,c,d,e,f){if(b&&a.I(b))!a.Da(b)||f&&b.p()===e||b(e);else if((b=c.get("_ko_property_writers"))&&b[d])b[d](e)}}}();a.b("expressionRewriting",a.h);a.b("expressionRewriting.bindingRewriteValidators",a.h.va);a.b("expressionRewriting.parseObjectLiteral",a.h.Ab);a.b("expressionRewriting.preProcessBindings",a.h.Xa);a.b("expressionRewriting._twoWayBindings",
+a.h.ga);a.b("jsonExpressionRewriting",a.h);a.b("jsonExpressionRewriting.insertPropertyAccessorsIntoJson",a.h.Xa);(function(){function b(a){return 8==a.nodeType&&g.test(f?a.text:a.nodeValue)}function c(a){return 8==a.nodeType&&h.test(f?a.text:a.nodeValue)}function d(a,d){for(var e=a,f=1,l=[];e=e.nextSibling;){if(c(e)&&(f--,0===f))return l;l.push(e);b(e)&&f++}if(!d)throw Error("Cannot find closing comment tag to match: "+a.nodeValue);return null}function e(a,b){var c=d(a,b);return c?0<c.length?c[c.length-
+1].nextSibling:a.nextSibling:null}var f=t&&"\x3c!--test--\x3e"===t.createComment("test").text,g=f?/^\x3c!--\s*ko(?:\s+([\s\S]+))?\s*--\x3e$/:/^\s*ko(?:\s+([\s\S]+))?\s*$/,h=f?/^\x3c!--\s*\/ko\s*--\x3e$/:/^\s*\/ko\s*$/,l={ul:!0,ol:!0};a.f={aa:{},childNodes:function(a){return b(a)?d(a):a.childNodes},za:function(c){if(b(c)){c=a.f.childNodes(c);for(var d=0,e=c.length;d<e;d++)a.removeNode(c[d])}else a.a.rb(c)},fa:function(c,d){if(b(c)){a.f.za(c);for(var e=c.nextSibling,f=0,l=d.length;f<l;f++)e.parentNode.insertBefore(d[f],
+e)}else a.a.fa(c,d)},qc:function(a,c){b(a)?a.parentNode.insertBefore(c,a.nextSibling):a.firstChild?a.insertBefore(c,a.firstChild):a.appendChild(c)},kc:function(c,d,e){e?b(c)?c.parentNode.insertBefore(d,e.nextSibling):e.nextSibling?c.insertBefore(d,e.nextSibling):c.appendChild(d):a.f.qc(c,d)},firstChild:function(a){return b(a)?!a.nextSibling||c(a.nextSibling)?null:a.nextSibling:a.firstChild},nextSibling:function(a){b(a)&&(a=e(a));return a.nextSibling&&c(a.nextSibling)?null:a.nextSibling},Yc:b,vd:function(a){return(a=
+(f?a.text:a.nodeValue).match(g))?a[1]:null},oc:function(d){if(l[a.a.A(d)]){var k=d.firstChild;if(k){do if(1===k.nodeType){var f;f=k.firstChild;var g=null;if(f){do if(g)g.push(f);else if(b(f)){var h=e(f,!0);h?f=h:g=[f]}else c(f)&&(g=[f]);while(f=f.nextSibling)}if(f=g)for(g=k.nextSibling,h=0;h<f.length;h++)g?d.insertBefore(f[h],g):d.appendChild(f[h])}while(k=k.nextSibling)}}}}})();a.b("virtualElements",a.f);a.b("virtualElements.allowedBindings",a.f.aa);a.b("virtualElements.emptyNode",a.f.za);a.b("virtualElements.insertAfter",
+a.f.kc);a.b("virtualElements.prepend",a.f.qc);a.b("virtualElements.setDomNodeChildren",a.f.fa);(function(){a.S=function(){this.Kc={}};a.a.extend(a.S.prototype,{nodeHasBindings:function(b){switch(b.nodeType){case 1:return null!=b.getAttribute("data-bind")||a.g.getComponentNameForNode(b);case 8:return a.f.Yc(b);default:return!1}},getBindings:function(b,c){var d=this.getBindingsString(b,c),d=d?this.parseBindingsString(d,c,b):null;return a.g.Rb(d,b,c,!1)},getBindingAccessors:function(b,c){var d=this.getBindingsString(b,
+c),d=d?this.parseBindingsString(d,c,b,{valueAccessors:!0}):null;return a.g.Rb(d,b,c,!0)},getBindingsString:function(b){switch(b.nodeType){case 1:return b.getAttribute("data-bind");case 8:return a.f.vd(b);default:return null}},parseBindingsString:function(b,c,d,e){try{var f=this.Kc,g=b+(e&&e.valueAccessors||""),h;if(!(h=f[g])){var l,m="with($context){with($data||{}){return{"+a.h.Xa(b,e)+"}}}";l=new Function("$context","$element",m);h=f[g]=l}return h(c,d)}catch(k){throw k.message="Unable to parse bindings.\nBindings value: "+
+b+"\nMessage: "+k.message,k;}}});a.S.instance=new a.S})();a.b("bindingProvider",a.S);(function(){function b(a){return function(){return a}}function c(a){return a()}function d(b){return a.a.Ea(a.l.w(b),function(a,c){return function(){return b()[c]}})}function e(c,e,k){return"function"===typeof c?d(c.bind(null,e,k)):a.a.Ea(c,b)}function f(a,b){return d(this.getBindings.bind(this,a,b))}function g(b,c,d){var e,k=a.f.firstChild(c),f=a.S.instance,m=f.preprocessNode;if(m){for(;e=k;)k=a.f.nextSibling(e),
+m.call(f,e);k=a.f.firstChild(c)}for(;e=k;)k=a.f.nextSibling(e),h(b,e,d)}function h(b,c,d){var e=!0,k=1===c.nodeType;k&&a.f.oc(c);if(k&&d||a.S.instance.nodeHasBindings(c))e=m(c,null,b,d).shouldBindDescendants;e&&!r[a.a.A(c)]&&g(b,c,!k)}function l(b){var c=[],d={},e=[];a.a.D(b,function X(k){if(!d[k]){var f=a.getBindingHandler(k);f&&(f.after&&(e.push(k),a.a.r(f.after,function(c){if(b[c]){if(-1!==a.a.o(e,c))throw Error("Cannot combine the following bindings, because they have a cyclic dependency: "+e.join(", "));
+X(c)}}),e.length--),c.push({key:k,jc:f}));d[k]=!0}});return c}function m(b,d,e,k){var m=a.a.e.get(b,q);if(!d){if(m)throw Error("You cannot apply bindings multiple times to the same element.");a.a.e.set(b,q,!0)}!m&&k&&a.xc(b,e);var g;if(d&&"function"!==typeof d)g=d;else{var h=a.S.instance,r=h.getBindingAccessors||f,p=a.B(function(){(g=d?d(e,b):r.call(h,b,e))&&e.Q&&e.Q();return g},null,{i:b});g&&p.ca()||(p=null)}var s;if(g){var t=p?function(a){return function(){return c(p()[a])}}:function(a){return g[a]},
+u=function(){return a.a.Ea(p?p():g,c)};u.get=function(a){return g[a]&&c(t(a))};u.has=function(a){return a in g};k=l(g);a.a.r(k,function(c){var d=c.jc.init,k=c.jc.update,f=c.key;if(8===b.nodeType&&!a.f.aa[f])throw Error("The binding '"+f+"' cannot be used with virtual elements");try{"function"==typeof d&&a.l.w(function(){var a=d(b,t(f),u,e.$data,e);if(a&&a.controlsDescendantBindings){if(s!==n)throw Error("Multiple bindings ("+s+" and "+f+") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.");
+s=f}}),"function"==typeof k&&a.B(function(){k(b,t(f),u,e.$data,e)},null,{i:b})}catch(m){throw m.message='Unable to process binding "'+f+": "+g[f]+'"\nMessage: '+m.message,m;}})}return{shouldBindDescendants:s===n}}function k(b){return b&&b instanceof a.R?b:new a.R(b)}a.d={};var r={script:!0,textarea:!0,template:!0};a.getBindingHandler=function(b){return a.d[b]};a.R=function(b,c,d,e,k){function f(){var k=g?b():b,m=a.a.c(k);c?(c.Q&&c.Q(),a.a.extend(l,c),l.Q=r):(l.$parents=[],l.$root=m,l.ko=a);l.$rawData=
+k;l.$data=m;d&&(l[d]=m);e&&e(l,c,m);return l.$data}function m(){return h&&!a.a.Tb(h)}var l=this,g="function"==typeof b&&!a.I(b),h,r;k&&k.exportDependencies?f():(r=a.B(f,null,{ya:m,i:!0}),r.ca()&&(l.Q=r,r.equalityComparer=null,h=[],r.Dc=function(b){h.push(b);a.a.G.qa(b,function(b){a.a.Na(h,b);h.length||(r.k(),l.Q=r=n)})}))};a.R.prototype.createChildContext=function(b,c,d,e){return new a.R(b,this,c,function(a,b){a.$parentContext=b;a.$parent=b.$data;a.$parents=(b.$parents||[]).slice(0);a.$parents.unshift(a.$parent);
+d&&d(a)},e)};a.R.prototype.extend=function(b){return new a.R(this.Q||this.$data,this,null,function(c,d){c.$rawData=d.$rawData;a.a.extend(c,"function"==typeof b?b():b)})};a.R.prototype.ac=function(a,b){return this.createChildContext(a,b,null,{exportDependencies:!0})};var q=a.a.e.J(),p=a.a.e.J();a.xc=function(b,c){if(2==arguments.length)a.a.e.set(b,p,c),c.Q&&c.Q.Dc(b);else return a.a.e.get(b,p)};a.La=function(b,c,d){1===b.nodeType&&a.f.oc(b);return m(b,c,k(d),!0)};a.Ic=function(b,c,d){d=k(d);return a.La(b,
+e(c,d,b),d)};a.hb=function(a,b){1!==b.nodeType&&8!==b.nodeType||g(k(a),b,!0)};a.Ub=function(a,b){!u&&x.jQuery&&(u=x.jQuery);if(b&&1!==b.nodeType&&8!==b.nodeType)throw Error("ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node");b=b||x.document.body;h(k(a),b,!0)};a.nb=function(b){switch(b.nodeType){case 1:case 8:var c=a.xc(b);if(c)return c;if(b.parentNode)return a.nb(b.parentNode)}return n};a.Oc=function(b){return(b=a.nb(b))?b.$data:n};a.b("bindingHandlers",
+a.d);a.b("applyBindings",a.Ub);a.b("applyBindingsToDescendants",a.hb);a.b("applyBindingAccessorsToNode",a.La);a.b("applyBindingsToNode",a.Ic);a.b("contextFor",a.nb);a.b("dataFor",a.Oc)})();(function(b){function c(c,e){var m=f.hasOwnProperty(c)?f[c]:b,k;m?m.Y(e):(m=f[c]=new a.K,m.Y(e),d(c,function(b,d){var e=!(!d||!d.synchronous);g[c]={definition:b,dd:e};delete f[c];k||e?m.notifySubscribers(b):a.Z.Za(function(){m.notifySubscribers(b)})}),k=!0)}function d(a,b){e("getConfig",[a],function(c){c?e("loadComponent",
+[a,c],function(a){b(a,c)}):b(null,null)})}function e(c,d,f,k){k||(k=a.g.loaders.slice(0));var g=k.shift();if(g){var q=g[c];if(q){var p=!1;if(q.apply(g,d.concat(function(a){p?f(null):null!==a?f(a):e(c,d,f,k)}))!==b&&(p=!0,!g.suppressLoaderExceptions))throw Error("Component loaders must supply values by invoking the callback, not by returning values synchronously.");}else e(c,d,f,k)}else f(null)}var f={},g={};a.g={get:function(d,e){var f=g.hasOwnProperty(d)?g[d]:b;f?f.dd?a.l.w(function(){e(f.definition)}):
+a.Z.Za(function(){e(f.definition)}):c(d,e)},$b:function(a){delete g[a]},Nb:e};a.g.loaders=[];a.b("components",a.g);a.b("components.get",a.g.get);a.b("components.clearCachedDefinition",a.g.$b)})();(function(){function b(b,c,d,e){function g(){0===--y&&e(h)}var h={},y=2,v=d.template;d=d.viewModel;v?f(c,v,function(c){a.g.Nb("loadTemplate",[b,c],function(a){h.template=a;g()})}):g();d?f(c,d,function(c){a.g.Nb("loadViewModel",[b,c],function(a){h[l]=a;g()})}):g()}function c(a,b,d){if("function"===typeof b)d(function(a){return new b(a)});
+else if("function"===typeof b[l])d(b[l]);else if("instance"in b){var e=b.instance;d(function(){return e})}else"viewModel"in b?c(a,b.viewModel,d):a("Unknown viewModel value: "+b)}function d(b){switch(a.a.A(b)){case "script":return a.a.na(b.text);case "textarea":return a.a.na(b.value);case "template":if(e(b.content))return a.a.wa(b.content.childNodes)}return a.a.wa(b.childNodes)}function e(a){return x.DocumentFragment?a instanceof DocumentFragment:a&&11===a.nodeType}function f(a,b,c){"string"===typeof b.require?
+O||x.require?(O||x.require)([b.require],c):a("Uses require, but no AMD loader is present"):c(b)}function g(a){return function(b){throw Error("Component '"+a+"': "+b);}}var h={};a.g.register=function(b,c){if(!c)throw Error("Invalid configuration for "+b);if(a.g.wb(b))throw Error("Component "+b+" is already registered");h[b]=c};a.g.wb=function(a){return h.hasOwnProperty(a)};a.g.ud=function(b){delete h[b];a.g.$b(b)};a.g.cc={getConfig:function(a,b){b(h.hasOwnProperty(a)?h[a]:null)},loadComponent:function(a,
+c,d){var e=g(a);f(e,c,function(c){b(a,e,c,d)})},loadTemplate:function(b,c,f){b=g(b);if("string"===typeof c)f(a.a.na(c));else if(c instanceof Array)f(c);else if(e(c))f(a.a.W(c.childNodes));else if(c.element)if(c=c.element,x.HTMLElement?c instanceof HTMLElement:c&&c.tagName&&1===c.nodeType)f(d(c));else if("string"===typeof c){var l=t.getElementById(c);l?f(d(l)):b("Cannot find element with ID "+c)}else b("Unknown element type: "+c);else b("Unknown template value: "+c)},loadViewModel:function(a,b,d){c(g(a),
+b,d)}};var l="createViewModel";a.b("components.register",a.g.register);a.b("components.isRegistered",a.g.wb);a.b("components.unregister",a.g.ud);a.b("components.defaultLoader",a.g.cc);a.g.loaders.push(a.g.cc);a.g.Ec=h})();(function(){function b(b,e){var f=b.getAttribute("params");if(f){var f=c.parseBindingsString(f,e,b,{valueAccessors:!0,bindingParams:!0}),f=a.a.Ea(f,function(c){return a.m(c,null,{i:b})}),g=a.a.Ea(f,function(c){var e=c.p();return c.ca()?a.m({read:function(){return a.a.c(c())},write:a.Da(e)&&
+function(a){c()(a)},i:b}):e});g.hasOwnProperty("$raw")||(g.$raw=f);return g}return{$raw:{}}}a.g.getComponentNameForNode=function(b){var c=a.a.A(b);if(a.g.wb(c)&&(-1!=c.indexOf("-")||"[object HTMLUnknownElement]"==""+b||8>=a.a.C&&b.tagName===c))return c};a.g.Rb=function(c,e,f,g){if(1===e.nodeType){var h=a.g.getComponentNameForNode(e);if(h){c=c||{};if(c.component)throw Error('Cannot use the "component" binding on a custom element matching a component');var l={name:h,params:b(e,f)};c.component=g?function(){return l}:
+l}}return c};var c=new a.S;9>a.a.C&&(a.g.register=function(a){return function(b){t.createElement(b);return a.apply(this,arguments)}}(a.g.register),t.createDocumentFragment=function(b){return function(){var c=b(),f=a.g.Ec,g;for(g in f)f.hasOwnProperty(g)&&c.createElement(g);return c}}(t.createDocumentFragment))})();(function(b){function c(b,c,d){c=c.template;if(!c)throw Error("Component '"+b+"' has no template");b=a.a.wa(c);a.f.fa(d,b)}function d(a,b,c,d){var e=a.createViewModel;return e?e.call(a,
+d,{element:b,templateNodes:c}):d}var e=0;a.d.component={init:function(f,g,h,l,m){function k(){var a=r&&r.dispose;"function"===typeof a&&a.call(r);q=r=null}var r,q,p=a.a.W(a.f.childNodes(f));a.a.G.qa(f,k);a.m(function(){var l=a.a.c(g()),h,v;"string"===typeof l?h=l:(h=a.a.c(l.name),v=a.a.c(l.params));if(!h)throw Error("No component name specified");var n=q=++e;a.g.get(h,function(e){if(q===n){k();if(!e)throw Error("Unknown component '"+h+"'");c(h,e,f);var l=d(e,f,p,v);e=m.createChildContext(l,b,function(a){a.$component=
+l;a.$componentTemplateNodes=p});r=l;a.hb(e,f)}})},null,{i:f});return{controlsDescendantBindings:!0}}};a.f.aa.component=!0})();var Q={"class":"className","for":"htmlFor"};a.d.attr={update:function(b,c){var d=a.a.c(c())||{};a.a.D(d,function(c,d){d=a.a.c(d);var g=!1===d||null===d||d===n;g&&b.removeAttribute(c);8>=a.a.C&&c in Q?(c=Q[c],g?b.removeAttribute(c):b[c]=d):g||b.setAttribute(c,d.toString());"name"===c&&a.a.vc(b,g?"":d.toString())})}};(function(){a.d.checked={after:["value","attr"],init:function(b,
+c,d){function e(){var e=b.checked,f=p?g():e;if(!a.xa.Va()&&(!l||e)){var h=a.l.w(c);if(k){var m=r?h.p():h;q!==f?(e&&(a.a.ra(m,f,!0),a.a.ra(m,q,!1)),q=f):a.a.ra(m,f,e);r&&a.Da(h)&&h(m)}else a.h.Ga(h,d,"checked",f,!0)}}function f(){var d=a.a.c(c());b.checked=k?0<=a.a.o(d,g()):h?d:g()===d}var g=a.rc(function(){return d.has("checkedValue")?a.a.c(d.get("checkedValue")):d.has("value")?a.a.c(d.get("value")):b.value}),h="checkbox"==b.type,l="radio"==b.type;if(h||l){var m=c(),k=h&&a.a.c(m)instanceof Array,
+r=!(k&&m.push&&m.splice),q=k?g():n,p=l||k;l&&!b.name&&a.d.uniqueName.init(b,function(){return!0});a.m(e,null,{i:b});a.a.q(b,"click",e);a.m(f,null,{i:b});m=n}}};a.h.ga.checked=!0;a.d.checkedValue={update:function(b,c){b.value=a.a.c(c())}}})();a.d.css={update:function(b,c){var d=a.a.c(c());null!==d&&"object"==typeof d?a.a.D(d,function(c,d){d=a.a.c(d);a.a.fb(b,c,d)}):(d=a.a.cb(String(d||"")),a.a.fb(b,b.__ko__cssValue,!1),b.__ko__cssValue=d,a.a.fb(b,d,!0))}};a.d.enable={update:function(b,c){var d=a.a.c(c());
+d&&b.disabled?b.removeAttribute("disabled"):d||b.disabled||(b.disabled=!0)}};a.d.disable={update:function(b,c){a.d.enable.update(b,function(){return!a.a.c(c())})}};a.d.event={init:function(b,c,d,e,f){var g=c()||{};a.a.D(g,function(g){"string"==typeof g&&a.a.q(b,g,function(b){var m,k=c()[g];if(k){try{var r=a.a.W(arguments);e=f.$data;r.unshift(e);m=k.apply(e,r)}finally{!0!==m&&(b.preventDefault?b.preventDefault():b.returnValue=!1)}!1===d.get(g+"Bubble")&&(b.cancelBubble=!0,b.stopPropagation&&b.stopPropagation())}})})}};
+a.d.foreach={mc:function(b){return function(){var c=b(),d=a.a.Bb(c);if(!d||"number"==typeof d.length)return{foreach:c,templateEngine:a.X.vb};a.a.c(c);return{foreach:d.data,as:d.as,includeDestroyed:d.includeDestroyed,afterAdd:d.afterAdd,beforeRemove:d.beforeRemove,afterRender:d.afterRender,beforeMove:d.beforeMove,afterMove:d.afterMove,templateEngine:a.X.vb}}},init:function(b,c){return a.d.template.init(b,a.d.foreach.mc(c))},update:function(b,c,d,e,f){return a.d.template.update(b,a.d.foreach.mc(c),
+d,e,f)}};a.h.va.foreach=!1;a.f.aa.foreach=!0;a.d.hasfocus={init:function(b,c,d){function e(e){b.__ko_hasfocusUpdating=!0;var f=b.ownerDocument;if("activeElement"in f){var g;try{g=f.activeElement}catch(k){g=f.body}e=g===b}f=c();a.h.Ga(f,d,"hasfocus",e,!0);b.__ko_hasfocusLastValue=e;b.__ko_hasfocusUpdating=!1}var f=e.bind(null,!0),g=e.bind(null,!1);a.a.q(b,"focus",f);a.a.q(b,"focusin",f);a.a.q(b,"blur",g);a.a.q(b,"focusout",g)},update:function(b,c){var d=!!a.a.c(c());b.__ko_hasfocusUpdating||b.__ko_hasfocusLastValue===
+d||(d?b.focus():b.blur(),!d&&b.__ko_hasfocusLastValue&&b.ownerDocument.body.focus(),a.l.w(a.a.Fa,null,[b,d?"focusin":"focusout"]))}};a.h.ga.hasfocus=!0;a.d.hasFocus=a.d.hasfocus;a.h.ga.hasFocus=!0;a.d.html={init:function(){return{controlsDescendantBindings:!0}},update:function(b,c){a.a.Eb(b,c())}};K("if");K("ifnot",!1,!0);K("with",!0,!1,function(a,c){return a.ac(c)});var L={};a.d.options={init:function(b){if("select"!==a.a.A(b))throw Error("options binding applies only to SELECT elements");for(;0<
+b.length;)b.remove(0);return{controlsDescendantBindings:!0}},update:function(b,c,d){function e(){return a.a.Ma(b.options,function(a){return a.selected})}function f(a,b,c){var d=typeof b;return"function"==d?b(a):"string"==d?a[b]:c}function g(c,e){if(A&&k)a.j.ja(b,a.a.c(d.get("value")),!0);else if(p.length){var f=0<=a.a.o(p,a.j.u(e[0]));a.a.wc(e[0],f);A&&!f&&a.l.w(a.a.Fa,null,[b,"change"])}}var h=b.multiple,l=0!=b.length&&h?b.scrollTop:null,m=a.a.c(c()),k=d.get("valueAllowUnset")&&d.has("value"),r=
+d.get("optionsIncludeDestroyed");c={};var q,p=[];k||(h?p=a.a.ib(e(),a.j.u):0<=b.selectedIndex&&p.push(a.j.u(b.options[b.selectedIndex])));m&&("undefined"==typeof m.length&&(m=[m]),q=a.a.Ma(m,function(b){return r||b===n||null===b||!a.a.c(b._destroy)}),d.has("optionsCaption")&&(m=a.a.c(d.get("optionsCaption")),null!==m&&m!==n&&q.unshift(L)));var A=!1;c.beforeRemove=function(a){b.removeChild(a)};m=g;d.has("optionsAfterRender")&&"function"==typeof d.get("optionsAfterRender")&&(m=function(b,c){g(0,c);
+a.l.w(d.get("optionsAfterRender"),null,[c[0],b!==L?b:n])});a.a.Db(b,q,function(c,e,g){g.length&&(p=!k&&g[0].selected?[a.j.u(g[0])]:[],A=!0);e=b.ownerDocument.createElement("option");c===L?(a.a.bb(e,d.get("optionsCaption")),a.j.ja(e,n)):(g=f(c,d.get("optionsValue"),c),a.j.ja(e,a.a.c(g)),c=f(c,d.get("optionsText"),g),a.a.bb(e,c));return[e]},c,m);a.l.w(function(){k?a.j.ja(b,a.a.c(d.get("value")),!0):(h?p.length&&e().length<p.length:p.length&&0<=b.selectedIndex?a.j.u(b.options[b.selectedIndex])!==p[0]:
+p.length||0<=b.selectedIndex)&&a.a.Fa(b,"change")});a.a.Sc(b);l&&20<Math.abs(l-b.scrollTop)&&(b.scrollTop=l)}};a.d.options.zb=a.a.e.J();a.d.selectedOptions={after:["options","foreach"],init:function(b,c,d){a.a.q(b,"change",function(){var e=c(),f=[];a.a.r(b.getElementsByTagName("option"),function(b){b.selected&&f.push(a.j.u(b))});a.h.Ga(e,d,"selectedOptions",f)})},update:function(b,c){if("select"!=a.a.A(b))throw Error("values binding applies only to SELECT elements");var d=a.a.c(c()),e=b.scrollTop;
+d&&"number"==typeof d.length&&a.a.r(b.getElementsByTagName("option"),function(b){var c=0<=a.a.o(d,a.j.u(b));b.selected!=c&&a.a.wc(b,c)});b.scrollTop=e}};a.h.ga.selectedOptions=!0;a.d.style={update:function(b,c){var d=a.a.c(c()||{});a.a.D(d,function(c,d){d=a.a.c(d);if(null===d||d===n||!1===d)d="";b.style[c]=d})}};a.d.submit={init:function(b,c,d,e,f){if("function"!=typeof c())throw Error("The value for a submit binding must be a function");a.a.q(b,"submit",function(a){var d,e=c();try{d=e.call(f.$data,
+b)}finally{!0!==d&&(a.preventDefault?a.preventDefault():a.returnValue=!1)}})}};a.d.text={init:function(){return{controlsDescendantBindings:!0}},update:function(b,c){a.a.bb(b,c())}};a.f.aa.text=!0;(function(){if(x&&x.navigator)var b=function(a){if(a)return parseFloat(a[1])},c=x.opera&&x.opera.version&&parseInt(x.opera.version()),d=x.navigator.userAgent,e=b(d.match(/^(?:(?!chrome).)*version\/([^ ]*) safari/i)),f=b(d.match(/Firefox\/([^ ]*)/));if(10>a.a.C)var g=a.a.e.J(),h=a.a.e.J(),l=function(b){var c=
+this.activeElement;(c=c&&a.a.e.get(c,h))&&c(b)},m=function(b,c){var d=b.ownerDocument;a.a.e.get(d,g)||(a.a.e.set(d,g,!0),a.a.q(d,"selectionchange",l));a.a.e.set(b,h,c)};a.d.textInput={init:function(b,d,g){function l(c,d){a.a.q(b,c,d)}function h(){var c=a.a.c(d());if(null===c||c===n)c="";u!==n&&c===u?a.a.setTimeout(h,4):b.value!==c&&(s=c,b.value=c)}function y(){t||(u=b.value,t=a.a.setTimeout(v,4))}function v(){clearTimeout(t);u=t=n;var c=b.value;s!==c&&(s=c,a.h.Ga(d(),g,"textInput",c))}var s=b.value,
+t,u,x=9==a.a.C?y:v;10>a.a.C?(l("propertychange",function(a){"value"===a.propertyName&&x(a)}),8==a.a.C&&(l("keyup",v),l("keydown",v)),8<=a.a.C&&(m(b,x),l("dragend",y))):(l("input",v),5>e&&"textarea"===a.a.A(b)?(l("keydown",y),l("paste",y),l("cut",y)):11>c?l("keydown",y):4>f&&(l("DOMAutoComplete",v),l("dragdrop",v),l("drop",v)));l("change",v);a.m(h,null,{i:b})}};a.h.ga.textInput=!0;a.d.textinput={preprocess:function(a,b,c){c("textInput",a)}}})();a.d.uniqueName={init:function(b,c){if(c()){var d="ko_unique_"+
+++a.d.uniqueName.Nc;a.a.vc(b,d)}}};a.d.uniqueName.Nc=0;a.d.value={after:["options","foreach"],init:function(b,c,d){if("input"!=b.tagName.toLowerCase()||"checkbox"!=b.type&&"radio"!=b.type){var e=["change"],f=d.get("valueUpdate"),g=!1,h=null;f&&("string"==typeof f&&(f=[f]),a.a.ta(e,f),e=a.a.Wb(e));var l=function(){h=null;g=!1;var e=c(),f=a.j.u(b);a.h.Ga(e,d,"value",f)};!a.a.C||"input"!=b.tagName.toLowerCase()||"text"!=b.type||"off"==b.autocomplete||b.form&&"off"==b.form.autocomplete||-1!=a.a.o(e,"propertychange")||
+(a.a.q(b,"propertychange",function(){g=!0}),a.a.q(b,"focus",function(){g=!1}),a.a.q(b,"blur",function(){g&&l()}));a.a.r(e,function(c){var d=l;a.a.sd(c,"after")&&(d=function(){h=a.j.u(b);a.a.setTimeout(l,0)},c=c.substring(5));a.a.q(b,c,d)});var m=function(){var e=a.a.c(c()),f=a.j.u(b);if(null!==h&&e===h)a.a.setTimeout(m,0);else if(e!==f)if("select"===a.a.A(b)){var g=d.get("valueAllowUnset"),f=function(){a.j.ja(b,e,g)};f();g||e===a.j.u(b)?a.a.setTimeout(f,0):a.l.w(a.a.Fa,null,[b,"change"])}else a.j.ja(b,
+e)};a.m(m,null,{i:b})}else a.La(b,{checkedValue:c})},update:function(){}};a.h.ga.value=!0;a.d.visible={update:function(b,c){var d=a.a.c(c()),e="none"!=b.style.display;d&&!e?b.style.display="":!d&&e&&(b.style.display="none")}};(function(b){a.d[b]={init:function(c,d,e,f,g){return a.d.event.init.call(this,c,function(){var a={};a[b]=d();return a},e,f,g)}}})("click");a.P=function(){};a.P.prototype.renderTemplateSource=function(){throw Error("Override renderTemplateSource");};a.P.prototype.createJavaScriptEvaluatorBlock=
+function(){throw Error("Override createJavaScriptEvaluatorBlock");};a.P.prototype.makeTemplateSource=function(b,c){if("string"==typeof b){c=c||t;var d=c.getElementById(b);if(!d)throw Error("Cannot find template with ID "+b);return new a.v.n(d)}if(1==b.nodeType||8==b.nodeType)return new a.v.sa(b);throw Error("Unknown template type: "+b);};a.P.prototype.renderTemplate=function(a,c,d,e){a=this.makeTemplateSource(a,e);return this.renderTemplateSource(a,c,d,e)};a.P.prototype.isTemplateRewritten=function(a,
+c){return!1===this.allowTemplateRewriting?!0:this.makeTemplateSource(a,c).data("isRewritten")};a.P.prototype.rewriteTemplate=function(a,c,d){a=this.makeTemplateSource(a,d);c=c(a.text());a.text(c);a.data("isRewritten",!0)};a.b("templateEngine",a.P);a.Ib=function(){function b(b,c,d,h){b=a.h.Ab(b);for(var l=a.h.va,m=0;m<b.length;m++){var k=b[m].key;if(l.hasOwnProperty(k)){var r=l[k];if("function"===typeof r){if(k=r(b[m].value))throw Error(k);}else if(!r)throw Error("This template engine does not support the '"+
+k+"' binding within its templates");}}d="ko.__tr_ambtns(function($context,$element){return(function(){return{ "+a.h.Xa(b,{valueAccessors:!0})+" } })()},'"+d.toLowerCase()+"')";return h.createJavaScriptEvaluatorBlock(d)+c}var c=/(<([a-z]+\d*)(?:\s+(?!data-bind\s*=\s*)[a-z0-9\-]+(?:=(?:\"[^\"]*\"|\'[^\']*\'|[^>]*))?)*\s+)data-bind\s*=\s*(["'])([\s\S]*?)\3/gi,d=/\x3c!--\s*ko\b\s*([\s\S]*?)\s*--\x3e/g;return{Tc:function(b,c,d){c.isTemplateRewritten(b,d)||c.rewriteTemplate(b,function(b){return a.Ib.jd(b,
+c)},d)},jd:function(a,f){return a.replace(c,function(a,c,d,e,k){return b(k,c,d,f)}).replace(d,function(a,c){return b(c,"\x3c!-- ko --\x3e","#comment",f)})},Jc:function(b,c){return a.N.yb(function(d,h){var l=d.nextSibling;l&&l.nodeName.toLowerCase()===c&&a.La(l,b,h)})}}}();a.b("__tr_ambtns",a.Ib.Jc);(function(){a.v={};a.v.n=function(b){if(this.n=b){var c=a.a.A(b);this.eb="script"===c?1:"textarea"===c?2:"template"==c&&b.content&&11===b.content.nodeType?3:4}};a.v.n.prototype.text=function(){var b=1===
+this.eb?"text":2===this.eb?"value":"innerHTML";if(0==arguments.length)return this.n[b];var c=arguments[0];"innerHTML"===b?a.a.Eb(this.n,c):this.n[b]=c};var b=a.a.e.J()+"_";a.v.n.prototype.data=function(c){if(1===arguments.length)return a.a.e.get(this.n,b+c);a.a.e.set(this.n,b+c,arguments[1])};var c=a.a.e.J();a.v.n.prototype.nodes=function(){var b=this.n;if(0==arguments.length)return(a.a.e.get(b,c)||{}).mb||(3===this.eb?b.content:4===this.eb?b:n);a.a.e.set(b,c,{mb:arguments[0]})};a.v.sa=function(a){this.n=
+a};a.v.sa.prototype=new a.v.n;a.v.sa.prototype.text=function(){if(0==arguments.length){var b=a.a.e.get(this.n,c)||{};b.Jb===n&&b.mb&&(b.Jb=b.mb.innerHTML);return b.Jb}a.a.e.set(this.n,c,{Jb:arguments[0]})};a.b("templateSources",a.v);a.b("templateSources.domElement",a.v.n);a.b("templateSources.anonymousTemplate",a.v.sa)})();(function(){function b(b,c,d){var e;for(c=a.f.nextSibling(c);b&&(e=b)!==c;)b=a.f.nextSibling(e),d(e,b)}function c(c,d){if(c.length){var e=c[0],f=c[c.length-1],g=e.parentNode,h=
+a.S.instance,n=h.preprocessNode;if(n){b(e,f,function(a,b){var c=a.previousSibling,d=n.call(h,a);d&&(a===e&&(e=d[0]||b),a===f&&(f=d[d.length-1]||c))});c.length=0;if(!e)return;e===f?c.push(e):(c.push(e,f),a.a.Ba(c,g))}b(e,f,function(b){1!==b.nodeType&&8!==b.nodeType||a.Ub(d,b)});b(e,f,function(b){1!==b.nodeType&&8!==b.nodeType||a.N.Cc(b,[d])});a.a.Ba(c,g)}}function d(a){return a.nodeType?a:0<a.length?a[0]:null}function e(b,e,f,h,q){q=q||{};var p=(b&&d(b)||f||{}).ownerDocument,n=q.templateEngine||g;
+a.Ib.Tc(f,n,p);f=n.renderTemplate(f,h,q,p);if("number"!=typeof f.length||0<f.length&&"number"!=typeof f[0].nodeType)throw Error("Template engine must return an array of DOM nodes");p=!1;switch(e){case "replaceChildren":a.f.fa(b,f);p=!0;break;case "replaceNode":a.a.uc(b,f);p=!0;break;case "ignoreTargetNode":break;default:throw Error("Unknown renderMode: "+e);}p&&(c(f,h),q.afterRender&&a.l.w(q.afterRender,null,[f,h.$data]));return f}function f(b,c,d){return a.I(b)?b():"function"===typeof b?b(c,d):b}
+var g;a.Fb=function(b){if(b!=n&&!(b instanceof a.P))throw Error("templateEngine must inherit from ko.templateEngine");g=b};a.Cb=function(b,c,k,h,q){k=k||{};if((k.templateEngine||g)==n)throw Error("Set a template engine before calling renderTemplate");q=q||"replaceChildren";if(h){var p=d(h);return a.B(function(){var g=c&&c instanceof a.R?c:new a.R(c,null,null,null,{exportDependencies:!0}),n=f(b,g.$data,g),g=e(h,q,n,g,k);"replaceNode"==q&&(h=g,p=d(h))},null,{ya:function(){return!p||!a.a.qb(p)},i:p&&
+"replaceNode"==q?p.parentNode:p})}return a.N.yb(function(d){a.Cb(b,c,k,d,"replaceNode")})};a.pd=function(b,d,g,h,q){function p(a,b){c(b,t);g.afterRender&&g.afterRender(b,a);t=null}function s(a,c){t=q.createChildContext(a,g.as,function(a){a.$index=c});var d=f(b,a,t);return e(null,"ignoreTargetNode",d,t,g)}var t;return a.B(function(){var b=a.a.c(d)||[];"undefined"==typeof b.length&&(b=[b]);b=a.a.Ma(b,function(b){return g.includeDestroyed||b===n||null===b||!a.a.c(b._destroy)});a.l.w(a.a.Db,null,[h,b,
+s,g,p])},null,{i:h})};var h=a.a.e.J();a.d.template={init:function(b,c){var d=a.a.c(c());if("string"==typeof d||d.name)a.f.za(b);else{if("nodes"in d){if(d=d.nodes||[],a.I(d))throw Error('The "nodes" option must be a plain, non-observable array.');}else d=a.f.childNodes(b);d=a.a.nc(d);(new a.v.sa(b)).nodes(d)}return{controlsDescendantBindings:!0}},update:function(b,c,d,e,f){var g=c();c=a.a.c(g);d=!0;e=null;"string"==typeof c?c={}:(g=c.name,"if"in c&&(d=a.a.c(c["if"])),d&&"ifnot"in c&&(d=!a.a.c(c.ifnot)));
+"foreach"in c?e=a.pd(g||b,d&&c.foreach||[],c,b,f):d?(f="data"in c?f.ac(c.data,c.as):f,e=a.Cb(g||b,f,c,b)):a.f.za(b);f=e;(c=a.a.e.get(b,h))&&"function"==typeof c.k&&c.k();a.a.e.set(b,h,f&&f.ca()?f:n)}};a.h.va.template=function(b){b=a.h.Ab(b);return 1==b.length&&b[0].unknown||a.h.fd(b,"name")?null:"This template engine does not support anonymous templates nested within its templates"};a.f.aa.template=!0})();a.b("setTemplateEngine",a.Fb);a.b("renderTemplate",a.Cb);a.a.hc=function(a,c,d){if(a.length&&
+c.length){var e,f,g,h,l;for(e=f=0;(!d||e<d)&&(h=a[f]);++f){for(g=0;l=c[g];++g)if(h.value===l.value){h.moved=l.index;l.moved=h.index;c.splice(g,1);e=g=0;break}e+=g}}};a.a.lb=function(){function b(b,d,e,f,g){var h=Math.min,l=Math.max,m=[],k,n=b.length,q,p=d.length,s=p-n||1,t=n+p+1,v,u,x;for(k=0;k<=n;k++)for(u=v,m.push(v=[]),x=h(p,k+s),q=l(0,k-1);q<=x;q++)v[q]=q?k?b[k-1]===d[q-1]?u[q-1]:h(u[q]||t,v[q-1]||t)+1:q+1:k+1;h=[];l=[];s=[];k=n;for(q=p;k||q;)p=m[k][q]-1,q&&p===m[k][q-1]?l.push(h[h.length]={status:e,
+value:d[--q],index:q}):k&&p===m[k-1][q]?s.push(h[h.length]={status:f,value:b[--k],index:k}):(--q,--k,g.sparse||h.push({status:"retained",value:d[q]}));a.a.hc(s,l,!g.dontLimitMoves&&10*n);return h.reverse()}return function(a,d,e){e="boolean"===typeof e?{dontLimitMoves:e}:e||{};a=a||[];d=d||[];return a.length<d.length?b(a,d,"added","deleted",e):b(d,a,"deleted","added",e)}}();a.b("utils.compareArrays",a.a.lb);(function(){function b(b,c,d,h,l){var m=[],k=a.B(function(){var k=c(d,l,a.a.Ba(m,b))||[];0<
+m.length&&(a.a.uc(m,k),h&&a.l.w(h,null,[d,k,l]));m.length=0;a.a.ta(m,k)},null,{i:b,ya:function(){return!a.a.Tb(m)}});return{ea:m,B:k.ca()?k:n}}var c=a.a.e.J(),d=a.a.e.J();a.a.Db=function(e,f,g,h,l){function m(b,c){w=q[c];u!==c&&(D[b]=w);w.tb(u++);a.a.Ba(w.ea,e);t.push(w);z.push(w)}function k(b,c){if(b)for(var d=0,e=c.length;d<e;d++)c[d]&&a.a.r(c[d].ea,function(a){b(a,d,c[d].ka)})}f=f||[];h=h||{};var r=a.a.e.get(e,c)===n,q=a.a.e.get(e,c)||[],p=a.a.ib(q,function(a){return a.ka}),s=a.a.lb(p,f,h.dontLimitMoves),
+t=[],v=0,u=0,x=[],z=[];f=[];for(var D=[],p=[],w,C=0,B,E;B=s[C];C++)switch(E=B.moved,B.status){case "deleted":E===n&&(w=q[v],w.B&&(w.B.k(),w.B=n),a.a.Ba(w.ea,e).length&&(h.beforeRemove&&(t.push(w),z.push(w),w.ka===d?w=null:f[C]=w),w&&x.push.apply(x,w.ea)));v++;break;case "retained":m(C,v++);break;case "added":E!==n?m(C,E):(w={ka:B.value,tb:a.O(u++)},t.push(w),z.push(w),r||(p[C]=w))}a.a.e.set(e,c,t);k(h.beforeMove,D);a.a.r(x,h.beforeRemove?a.ba:a.removeNode);for(var C=0,r=a.f.firstChild(e),F;w=z[C];C++){w.ea||
+a.a.extend(w,b(e,g,w.ka,l,w.tb));for(v=0;s=w.ea[v];r=s.nextSibling,F=s,v++)s!==r&&a.f.kc(e,s,F);!w.ad&&l&&(l(w.ka,w.ea,w.tb),w.ad=!0)}k(h.beforeRemove,f);for(C=0;C<f.length;++C)f[C]&&(f[C].ka=d);k(h.afterMove,D);k(h.afterAdd,p)}})();a.b("utils.setDomNodeChildrenFromArrayMapping",a.a.Db);a.X=function(){this.allowTemplateRewriting=!1};a.X.prototype=new a.P;a.X.prototype.renderTemplateSource=function(b,c,d,e){if(c=(9>a.a.C?0:b.nodes)?b.nodes():null)return a.a.W(c.cloneNode(!0).childNodes);b=b.text();
+return a.a.na(b,e)};a.X.vb=new a.X;a.Fb(a.X.vb);a.b("nativeTemplateEngine",a.X);(function(){a.xb=function(){var a=this.ed=function(){if(!u||!u.tmpl)return 0;try{if(0<=u.tmpl.tag.tmpl.open.toString().indexOf("__"))return 2}catch(a){}return 1}();this.renderTemplateSource=function(b,e,f,g){g=g||t;f=f||{};if(2>a)throw Error("Your version of jQuery.tmpl is too old. Please upgrade to jQuery.tmpl 1.0.0pre or later.");var h=b.data("precompiled");h||(h=b.text()||"",h=u.template(null,"{{ko_with $item.koBindingContext}}"+
+h+"{{/ko_with}}"),b.data("precompiled",h));b=[e.$data];e=u.extend({koBindingContext:e},f.templateOptions);e=u.tmpl(h,b,e);e.appendTo(g.createElement("div"));u.fragments={};return e};this.createJavaScriptEvaluatorBlock=function(a){return"{{ko_code ((function() { return "+a+" })()) }}"};this.addTemplate=function(a,b){t.write("<script type='text/html' id='"+a+"'>"+b+"\x3c/script>")};0<a&&(u.tmpl.tag.ko_code={open:"__.push($1 || '');"},u.tmpl.tag.ko_with={open:"with($1) {",close:"} "})};a.xb.prototype=
+new a.P;var b=new a.xb;0<b.ed&&a.Fb(b);a.b("jqueryTmplTemplateEngine",a.xb)})()})})();})();

routes/api/attributes.js

@@ -0,0 +1,48 @@
+"use strict";
+
+const express = require('express');
+const router = express.Router();
+const sql = require('../../services/sql');
+const auth = require('../../services/auth');
+const sync_table = require('../../services/sync_table');
+const utils = require('../../services/utils');
+const wrap = require('express-promise-wrap').wrap;
+
+router.get('/:noteId/attributes', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const noteId = req.params.noteId;
+
+    res.send(await sql.getAll("SELECT * FROM attributes WHERE note_id = ? ORDER BY date_created", [noteId]));
+}));
+
+router.put('/:noteId/attributes', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const noteId = req.params.noteId;
+    const attributes = req.body;
+    const now = utils.nowDate();
+
+    await sql.doInTransaction(async () => {
+        for (const attr of attributes) {
+            if (attr.attribute_id) {
+                await sql.execute("UPDATE attributes SET name = ?, value = ?, date_modified = ? WHERE attribute_id = ?",
+                    [attr.name, attr.value, now, attr.attribute_id]);
+            }
+            else {
+                attr.attribute_id = utils.newAttributeId();
+
+                await sql.insert("attributes", {
+                   attribute_id: attr.attribute_id,
+                   note_id: noteId,
+                   name: attr.name,
+                   value: attr.value,
+                   date_created: now,
+                   date_modified: now
+                });
+            }
+
+            await sync_table.addAttributeSync(attr.attribute_id);
+        }
+    });
+
+    res.send(await sql.getAll("SELECT * FROM attributes WHERE note_id = ? ORDER BY date_created", [noteId]));
+}));
+
+module.exports = router;

routes/api/cleanup.js

@@ -20,8 +20,16 @@ router.post('/cleanup-soft-deleted-items', auth.checkApiAuth, wrap(async (req, r
 
         await sql.execute(`DELETE FROM notes_history WHERE note_id IN (${noteIdsSql})`);
 
+        await sql.execute(`DELETE FROM notes_image WHERE note_id IN (${noteIdsSql})`);
+
+        await sql.execute(`DELETE FROM attributes WHERE note_id IN (${noteIdsSql})`);
+
         await sql.execute("DELETE FROM notes_tree WHERE is_deleted = 1");
 
+        await sql.execute("DELETE FROM notes_image WHERE is_deleted = 1");
+
+        await sql.execute("DELETE FROM images WHERE is_deleted = 1");
+
         await sql.execute("DELETE FROM notes WHERE is_deleted = 1");
 
         await sql.execute("DELETE FROM recent_notes");
@@ -37,6 +45,33 @@ router.post('/cleanup-soft-deleted-items', auth.checkApiAuth, wrap(async (req, r
     res.send({});
 }));
 
+router.post('/cleanup-unused-images', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const sourceId = req.headers.source_id;
+
+    await sql.doInTransaction(async () => {
+        const unusedImageIds = await sql.getFirstColumn(`
+          SELECT images.image_id 
+          FROM images 
+            LEFT JOIN notes_image ON notes_image.image_id = images.image_id AND notes_image.is_deleted = 0
+          WHERE
+            images.is_deleted = 0
+            AND notes_image.note_image_id IS NULL`);
+
+        const now = utils.nowDate();
+
+        for (const imageId of unusedImageIds) {
+            log.info(`Deleting unused image: ${imageId}`);
+
+            await sql.execute("UPDATE images SET is_deleted = 1, data = null, date_modified = ? WHERE image_id = ?",
+                [now, imageId]);
+
+            await sync_table.addImageSync(imageId, sourceId);
+        }
+    });
+
+    res.send({});
+}));
+
 router.post('/vacuum-database', auth.checkApiAuth, wrap(async (req, res, next) => {
     await sql.execute("VACUUM");
 

routes/api/cloning.js

@@ -0,0 +1,84 @@
+"use strict";
+
+const express = require('express');
+const router = express.Router();
+const sql = require('../../services/sql');
+const auth = require('../../services/auth');
+const utils = require('../../services/utils');
+const sync_table = require('../../services/sync_table');
+const wrap = require('express-promise-wrap').wrap;
+const tree = require('../../services/tree');
+
+router.put('/:childNoteId/clone-to/:parentNoteId', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const parentNoteId = req.params.parentNoteId;
+    const childNoteId = req.params.childNoteId;
+    const prefix = req.body.prefix;
+    const sourceId = req.headers.source_id;
+
+    if (!await tree.validateParentChild(res, parentNoteId, childNoteId)) {
+        return;
+    }
+
+    const maxNotePos = await sql.getFirstValue('SELECT MAX(note_position) FROM notes_tree WHERE parent_note_id = ? AND is_deleted = 0', [parentNoteId]);
+    const newNotePos = maxNotePos === null ? 0 : maxNotePos + 1;
+
+    await sql.doInTransaction(async () => {
+        const noteTree = {
+            note_tree_id: utils.newNoteTreeId(),
+            note_id: childNoteId,
+            parent_note_id: parentNoteId,
+            prefix: prefix,
+            note_position: newNotePos,
+            is_expanded: 0,
+            date_modified: utils.nowDate(),
+            is_deleted: 0
+        };
+
+        await sql.replace("notes_tree", noteTree);
+
+        await sync_table.addNoteTreeSync(noteTree.note_tree_id, sourceId);
+
+        await sql.execute("UPDATE notes_tree SET is_expanded = 1 WHERE note_id = ?", [parentNoteId]);
+    });
+
+    res.send({ success: true });
+}));
+
+router.put('/:noteId/clone-after/:afterNoteTreeId', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const noteId = req.params.noteId;
+    const afterNoteTreeId = req.params.afterNoteTreeId;
+    const sourceId = req.headers.source_id;
+
+    const afterNote = await tree.getNoteTree(afterNoteTreeId);
+
+    if (!await tree.validateParentChild(res, afterNote.parent_note_id, noteId)) {
+        return;
+    }
+
+    await sql.doInTransaction(async () => {
+        // we don't change date_modified so other changes are prioritized in case of conflict
+        // also we would have to sync all those modified note trees otherwise hash checks would fail
+        await sql.execute("UPDATE notes_tree SET note_position = note_position + 1 WHERE parent_note_id = ? AND note_position > ? AND is_deleted = 0",
+            [afterNote.parent_note_id, afterNote.note_position]);
+
+        await sync_table.addNoteReorderingSync(afterNote.parent_note_id, sourceId);
+
+        const noteTree = {
+            note_tree_id: utils.newNoteTreeId(),
+            note_id: noteId,
+            parent_note_id: afterNote.parent_note_id,
+            note_position: afterNote.note_position + 1,
+            is_expanded: 0,
+            date_modified: utils.nowDate(),
+            is_deleted: 0
+        };
+
+        await sql.replace("notes_tree", noteTree);
+
+        await sync_table.addNoteTreeSync(noteTree.note_tree_id, sourceId);
+    });
+
+    res.send({ success: true });
+}));
+
+module.exports = router;

routes/api/image.js

@@ -15,6 +15,8 @@ const jimp = require('jimp');
 const imageType = require('image-type');
 const sanitizeFilename = require('sanitize-filename');
 const wrap = require('express-promise-wrap').wrap;
+const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
+const fs = require('fs');
 
 router.get('/:imageId/:filename', auth.checkApiAuthOrElectron, wrap(async (req, res, next) => {
     const image = await sql.getFirst("SELECT * FROM images WHERE image_id = ?", [req.params.imageId]);
@@ -22,6 +24,10 @@ router.get('/:imageId/:filename', auth.checkApiAuthOrElectron, wrap(async (req,
     if (!image) {
         return res.status(404).send({});
     }
+    else if (image.data === null) {
+        res.set('Content-Type', 'image/png');
+        return res.send(fs.readFileSync(RESOURCE_DIR + '/db/image-deleted.png'));
+    }
 
     res.set('Content-Type', 'image/' + image.format);
 

routes/api/notes.js

@@ -6,8 +6,10 @@ const auth = require('../../services/auth');
 const sql = require('../../services/sql');
 const notes = require('../../services/notes');
 const log = require('../../services/log');
+const utils = require('../../services/utils');
 const protected_session = require('../../services/protected_session');
 const data_encryption = require('../../services/data_encryption');
+const tree = require('../../services/tree');
 const wrap = require('express-promise-wrap').wrap;
 
 router.get('/:noteId', auth.checkApiAuth, wrap(async (req, res, next) => {
@@ -57,26 +59,37 @@ router.put('/:noteId', auth.checkApiAuth, wrap(async (req, res, next) => {
     res.send({});
 }));
 
-router.delete('/:noteTreeId', auth.checkApiAuth, wrap(async (req, res, next) => {
+router.get('/', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const search = '%' + utils.sanitizeSql(req.query.search) + '%';
+
+    // searching in protected notes is pointless because of encryption
+    const noteIds = await sql.getFirstColumn(`SELECT note_id FROM notes 
+              WHERE is_deleted = 0 AND is_protected = 0 AND (note_title LIKE ? OR note_text LIKE ?)`, [search, search]);
+
+    res.send(noteIds);
+}));
+
+router.put('/:noteId/sort', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const noteId = req.params.noteId;
+    const sourceId = req.headers.source_id;
+    const dataKey = protected_session.getDataKey(req);
+
+    await tree.sortNotesAlphabetically(noteId, dataKey, sourceId);
+
+    res.send({});
+}));
+
+router.put('/:noteId/protect-sub-tree/:isProtected', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const noteId = req.params.noteId;
+    const isProtected = !!parseInt(req.params.isProtected);
+    const dataKey = protected_session.getDataKey(req);
+    const sourceId = req.headers.source_id;
+
     await sql.doInTransaction(async () => {
-        await notes.deleteNote(req.params.noteTreeId, req.headers.source_id);
+        await notes.protectNoteRecursively(noteId, dataKey, isProtected, sourceId);
     });
 
     res.send({});
 }));
 
-router.get('/', auth.checkApiAuth, wrap(async (req, res, next) => {
-    const search = '%' + req.query.search + '%';
-
-    const result = await sql.getAll("SELECT note_id FROM notes WHERE note_title LIKE ? OR note_text LIKE ?", [search, search]);
-
-    const noteIdList = [];
-
-    for (const res of result) {
-        noteIdList.push(res.note_id);
-    }
-
-    res.send(noteIdList);
-}));
-
 module.exports = router;

routes/api/notes_move.js

@@ -1,263 +0,0 @@
-"use strict";
-
-const express = require('express');
-const router = express.Router();
-const sql = require('../../services/sql');
-const auth = require('../../services/auth');
-const utils = require('../../services/utils');
-const sync_table = require('../../services/sync_table');
-const wrap = require('express-promise-wrap').wrap;
-
-/**
- * Code in this file deals with moving and cloning note tree rows. Relationship between note and parent note is unique
- * for not deleted note trees. There may be multiple deleted note-parent note relationships.
- */
-
-router.put('/:noteTreeId/move-to/:parentNoteId', auth.checkApiAuth, wrap(async (req, res, next) => {
-    const noteTreeId = req.params.noteTreeId;
-    const parentNoteId = req.params.parentNoteId;
-    const sourceId = req.headers.source_id;
-
-    const noteToMove = await getNoteTree(noteTreeId);
-
-    if (!await validateParentChild(res, parentNoteId, noteToMove.note_id, noteTreeId)) {
-        return;
-    }
-
-    const maxNotePos = await sql.getFirstValue('SELECT MAX(note_position) FROM notes_tree WHERE parent_note_id = ? AND is_deleted = 0', [parentNoteId]);
-    const newNotePos = maxNotePos === null ? 0 : maxNotePos + 1;
-
-    const now = utils.nowDate();
-
-    await sql.doInTransaction(async () => {
-        await sql.execute("UPDATE notes_tree SET parent_note_id = ?, note_position = ?, date_modified = ? WHERE note_tree_id = ?",
-            [parentNoteId, newNotePos, now, noteTreeId]);
-
-        await sync_table.addNoteTreeSync(noteTreeId, sourceId);
-    });
-
-    res.send({ success: true });
-}));
-
-router.put('/:noteTreeId/move-before/:beforeNoteTreeId', auth.checkApiAuth, wrap(async (req, res, next) => {
-    const noteTreeId = req.params.noteTreeId;
-    const beforeNoteTreeId = req.params.beforeNoteTreeId;
-    const sourceId = req.headers.source_id;
-
-    const noteToMove = await getNoteTree(noteTreeId);
-    const beforeNote = await getNoteTree(beforeNoteTreeId);
-
-    if (!await validateParentChild(res, beforeNote.parent_note_id, noteToMove.note_id, noteTreeId)) {
-        return;
-    }
-
-    await sql.doInTransaction(async () => {
-        // we don't change date_modified so other changes are prioritized in case of conflict
-        // also we would have to sync all those modified note trees otherwise hash checks would fail
-        await sql.execute("UPDATE notes_tree SET note_position = note_position + 1 WHERE parent_note_id = ? AND note_position >= ? AND is_deleted = 0",
-            [beforeNote.parent_note_id, beforeNote.note_position]);
-
-        await sync_table.addNoteReorderingSync(beforeNote.parent_note_id, sourceId);
-
-        const now = utils.nowDate();
-
-        await sql.execute("UPDATE notes_tree SET parent_note_id = ?, note_position = ?, date_modified = ? WHERE note_tree_id = ?",
-            [beforeNote.parent_note_id, beforeNote.note_position, now, noteTreeId]);
-
-        await sync_table.addNoteTreeSync(noteTreeId, sourceId);
-    });
-
-    res.send({ success: true });
-}));
-
-router.put('/:noteTreeId/move-after/:afterNoteTreeId', auth.checkApiAuth, wrap(async (req, res, next) => {
-    const noteTreeId = req.params.noteTreeId;
-    const afterNoteTreeId = req.params.afterNoteTreeId;
-    const sourceId = req.headers.source_id;
-
-    const noteToMove = await getNoteTree(noteTreeId);
-    const afterNote = await getNoteTree(afterNoteTreeId);
-
-    if (!await validateParentChild(res, afterNote.parent_note_id, noteToMove.note_id, noteTreeId)) {
-        return;
-    }
-
-    await sql.doInTransaction(async () => {
-        // we don't change date_modified so other changes are prioritized in case of conflict
-        // also we would have to sync all those modified note trees otherwise hash checks would fail
-        await sql.execute("UPDATE notes_tree SET note_position = note_position + 1 WHERE parent_note_id = ? AND note_position > ? AND is_deleted = 0",
-            [afterNote.parent_note_id, afterNote.note_position]);
-
-        await sync_table.addNoteReorderingSync(afterNote.parent_note_id, sourceId);
-
-        await sql.execute("UPDATE notes_tree SET parent_note_id = ?, note_position = ?, date_modified = ? WHERE note_tree_id = ?",
-            [afterNote.parent_note_id, afterNote.note_position + 1, utils.nowDate(), noteTreeId]);
-
-        await sync_table.addNoteTreeSync(noteTreeId, sourceId);
-    });
-
-    res.send({ success: true });
-}));
-
-router.put('/:childNoteId/clone-to/:parentNoteId', auth.checkApiAuth, wrap(async (req, res, next) => {
-    const parentNoteId = req.params.parentNoteId;
-    const childNoteId = req.params.childNoteId;
-    const prefix = req.body.prefix;
-    const sourceId = req.headers.source_id;
-
-    if (!await validateParentChild(res, parentNoteId, childNoteId)) {
-        return;
-    }
-
-    const maxNotePos = await sql.getFirstValue('SELECT MAX(note_position) FROM notes_tree WHERE parent_note_id = ? AND is_deleted = 0', [parentNoteId]);
-    const newNotePos = maxNotePos === null ? 0 : maxNotePos + 1;
-
-    await sql.doInTransaction(async () => {
-        const noteTree = {
-            note_tree_id: utils.newNoteTreeId(),
-            note_id: childNoteId,
-            parent_note_id: parentNoteId,
-            prefix: prefix,
-            note_position: newNotePos,
-            is_expanded: 0,
-            date_modified: utils.nowDate(),
-            is_deleted: 0
-        };
-
-        await sql.replace("notes_tree", noteTree);
-
-        await sync_table.addNoteTreeSync(noteTree.note_tree_id, sourceId);
-
-        await sql.execute("UPDATE notes_tree SET is_expanded = 1 WHERE note_id = ?", [parentNoteId]);
-    });
-
-    res.send({ success: true });
-}));
-
-router.put('/:noteId/clone-after/:afterNoteTreeId', auth.checkApiAuth, wrap(async (req, res, next) => {
-    const noteId = req.params.noteId;
-    const afterNoteTreeId = req.params.afterNoteTreeId;
-    const sourceId = req.headers.source_id;
-
-    const afterNote = await getNoteTree(afterNoteTreeId);
-
-    if (!await validateParentChild(res, afterNote.parent_note_id, noteId)) {
-        return;
-    }
-
-    await sql.doInTransaction(async () => {
-        // we don't change date_modified so other changes are prioritized in case of conflict
-        // also we would have to sync all those modified note trees otherwise hash checks would fail
-        await sql.execute("UPDATE notes_tree SET note_position = note_position + 1 WHERE parent_note_id = ? AND note_position > ? AND is_deleted = 0",
-            [afterNote.parent_note_id, afterNote.note_position]);
-
-        await sync_table.addNoteReorderingSync(afterNote.parent_note_id, sourceId);
-
-        const noteTree = {
-            note_tree_id: utils.newNoteTreeId(),
-            note_id: noteId,
-            parent_note_id: afterNote.parent_note_id,
-            note_position: afterNote.note_position + 1,
-            is_expanded: 0,
-            date_modified: utils.nowDate(),
-            is_deleted: 0
-        };
-
-        await sql.replace("notes_tree", noteTree);
-
-        await sync_table.addNoteTreeSync(noteTree.note_tree_id, sourceId);
-    });
-
-    res.send({ success: true });
-}));
-
-async function loadSubTreeNoteIds(parentNoteId, subTreeNoteIds) {
-    subTreeNoteIds.push(parentNoteId);
-
-    const children = await sql.getFirstColumn("SELECT note_id FROM notes_tree WHERE parent_note_id = ? AND is_deleted = 0", [parentNoteId]);
-
-    for (const childNoteId of children) {
-        await loadSubTreeNoteIds(childNoteId, subTreeNoteIds);
-    }
-}
-
-async function getNoteTree(noteTreeId) {
-    return sql.getFirst("SELECT * FROM notes_tree WHERE note_tree_id = ?", [noteTreeId]);
-}
-
-async function validateParentChild(res, parentNoteId, childNoteId, noteTreeId = null) {
-    const existing = await getExistingNoteTree(parentNoteId, childNoteId);
-
-    if (existing && (noteTreeId === null || existing.note_tree_id !== noteTreeId)) {
-        res.send({
-            success: false,
-            message: 'This note already exists in the target.'
-        });
-
-        return false;
-    }
-
-    if (!await checkTreeCycle(parentNoteId, childNoteId)) {
-        res.send({
-            success: false,
-            message: 'Moving note here would create cycle.'
-        });
-
-        return false;
-    }
-
-    return true;
-}
-
-async function getExistingNoteTree(parentNoteId, childNoteId) {
-    return await sql.getFirst('SELECT * FROM notes_tree WHERE note_id = ? AND parent_note_id = ? AND is_deleted = 0', [childNoteId, parentNoteId]);
-}
-
-/**
- * Tree cycle can be created when cloning or when moving existing clone. This method should detect both cases.
- */
-async function checkTreeCycle(parentNoteId, childNoteId) {
-    const subTreeNoteIds = [];
-
-    // we'll load the whole sub tree - because the cycle can start in one of the notes in the sub tree
-    await loadSubTreeNoteIds(childNoteId, subTreeNoteIds);
-
-    async function checkTreeCycleInner(parentNoteId) {
-        if (parentNoteId === 'root') {
-            return true;
-        }
-
-        if (subTreeNoteIds.includes(parentNoteId)) {
-            // while towards the root of the tree we encountered noteId which is already present in the subtree
-            // joining parentNoteId with childNoteId would then clearly create a cycle
-            return false;
-        }
-
-        const parentNoteIds = await sql.getFirstColumn("SELECT DISTINCT parent_note_id FROM notes_tree WHERE note_id = ? AND is_deleted = 0", [parentNoteId]);
-
-        for (const pid of parentNoteIds) {
-            if (!await checkTreeCycleInner(pid)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    return await checkTreeCycleInner(parentNoteId);
-}
-
-router.put('/:noteTreeId/expanded/:expanded', auth.checkApiAuth, wrap(async (req, res, next) => {
-    const noteTreeId = req.params.noteTreeId;
-    const expanded = req.params.expanded;
-
-    await sql.doInTransaction(async () => {
-        await sql.execute("UPDATE notes_tree SET is_expanded = ? WHERE note_tree_id = ?", [expanded, noteTreeId]);
-
-        // we don't sync expanded attribute
-    });
-
-    res.send({});
-}));
-
-module.exports = router;

routes/api/sync.js

@@ -99,12 +99,13 @@ router.get('/notes_history/:noteHistoryId', auth.checkApiAuth, wrap(async (req,
 
 router.get('/options/:optName', auth.checkApiAuth, wrap(async (req, res, next) => {
     const optName = req.params.optName;
+    const opt = await sql.getFirst("SELECT * FROM options WHERE opt_name = ?", [optName]);
 
-    if (!options.SYNCED_OPTIONS.includes(optName)) {
+    if (!opt.is_synced) {
         res.send("This option can't be synced.");
     }
     else {
-        res.send(await sql.getFirst("SELECT * FROM options WHERE opt_name = ?", [optName]));
+        res.send(opt);
     }
 }));
 
@@ -140,6 +141,12 @@ router.get('/notes_image/:noteImageId', auth.checkApiAuth, wrap(async (req, res,
     res.send(await sql.getFirst("SELECT * FROM notes_image WHERE note_image_id = ?", [noteImageId]));
 }));
 
+router.get('/attributes/:attributeId', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const attributeId = req.params.attributeId;
+
+    res.send(await sql.getFirst("SELECT * FROM attributes WHERE attribute_id = ?", [attributeId]));
+}));
+
 router.put('/notes', auth.checkApiAuth, wrap(async (req, res, next) => {
     await syncUpdate.updateNote(req.body.entity, req.body.sourceId);
 
@@ -188,4 +195,10 @@ router.put('/notes_image', auth.checkApiAuth, wrap(async (req, res, next) => {
     res.send({});
 }));
 
+router.put('/attributes', auth.checkApiAuth, wrap(async (req, res, next) => {
+    await syncUpdate.updateAttribute(req.body.entity, req.body.sourceId);
+
+    res.send({});
+}));
+
 module.exports = router;

routes/api/tree.js

@@ -8,7 +8,6 @@ const utils = require('../../services/utils');
 const auth = require('../../services/auth');
 const protected_session = require('../../services/protected_session');
 const data_encryption = require('../../services/data_encryption');
-const notes = require('../../services/notes');
 const sync_table = require('../../services/sync_table');
 const wrap = require('express-promise-wrap').wrap;
 
@@ -42,19 +41,6 @@ router.get('/', auth.checkApiAuth, wrap(async (req, res, next) => {
     });
 }));
 
-router.put('/:noteId/protect-sub-tree/:isProtected', auth.checkApiAuth, wrap(async (req, res, next) => {
-    const noteId = req.params.noteId;
-    const isProtected = !!parseInt(req.params.isProtected);
-    const dataKey = protected_session.getDataKey(req);
-    const sourceId = req.headers.source_id;
-
-    await sql.doInTransaction(async () => {
-        await notes.protectNoteRecursively(noteId, dataKey, isProtected, sourceId);
-    });
-
-    res.send({});
-}));
-
 router.put('/:noteTreeId/set-prefix', auth.checkApiAuth, wrap(async (req, res, next) => {
     const noteTreeId = req.params.noteTreeId;
     const sourceId = req.headers.source_id;

routes/api/tree_changes.js

@@ -0,0 +1,125 @@
+"use strict";
+
+const express = require('express');
+const router = express.Router();
+const sql = require('../../services/sql');
+const auth = require('../../services/auth');
+const utils = require('../../services/utils');
+const sync_table = require('../../services/sync_table');
+const tree = require('../../services/tree');
+const notes = require('../../services/notes');
+const wrap = require('express-promise-wrap').wrap;
+
+/**
+ * Code in this file deals with moving and cloning note tree rows. Relationship between note and parent note is unique
+ * for not deleted note trees. There may be multiple deleted note-parent note relationships.
+ */
+
+router.put('/:noteTreeId/move-to/:parentNoteId', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const noteTreeId = req.params.noteTreeId;
+    const parentNoteId = req.params.parentNoteId;
+    const sourceId = req.headers.source_id;
+
+    const noteToMove = await tree.getNoteTree(noteTreeId);
+
+    if (!await tree.validateParentChild(res, parentNoteId, noteToMove.note_id, noteTreeId)) {
+        return;
+    }
+
+    const maxNotePos = await sql.getFirstValue('SELECT MAX(note_position) FROM notes_tree WHERE parent_note_id = ? AND is_deleted = 0', [parentNoteId]);
+    const newNotePos = maxNotePos === null ? 0 : maxNotePos + 1;
+
+    const now = utils.nowDate();
+
+    await sql.doInTransaction(async () => {
+        await sql.execute("UPDATE notes_tree SET parent_note_id = ?, note_position = ?, date_modified = ? WHERE note_tree_id = ?",
+            [parentNoteId, newNotePos, now, noteTreeId]);
+
+        await sync_table.addNoteTreeSync(noteTreeId, sourceId);
+    });
+
+    res.send({ success: true });
+}));
+
+router.put('/:noteTreeId/move-before/:beforeNoteTreeId', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const noteTreeId = req.params.noteTreeId;
+    const beforeNoteTreeId = req.params.beforeNoteTreeId;
+    const sourceId = req.headers.source_id;
+
+    const noteToMove = await tree.getNoteTree(noteTreeId);
+    const beforeNote = await tree.getNoteTree(beforeNoteTreeId);
+
+    if (!await tree.validateParentChild(res, beforeNote.parent_note_id, noteToMove.note_id, noteTreeId)) {
+        return;
+    }
+
+    await sql.doInTransaction(async () => {
+        // we don't change date_modified so other changes are prioritized in case of conflict
+        // also we would have to sync all those modified note trees otherwise hash checks would fail
+        await sql.execute("UPDATE notes_tree SET note_position = note_position + 1 WHERE parent_note_id = ? AND note_position >= ? AND is_deleted = 0",
+            [beforeNote.parent_note_id, beforeNote.note_position]);
+
+        await sync_table.addNoteReorderingSync(beforeNote.parent_note_id, sourceId);
+
+        const now = utils.nowDate();
+
+        await sql.execute("UPDATE notes_tree SET parent_note_id = ?, note_position = ?, date_modified = ? WHERE note_tree_id = ?",
+            [beforeNote.parent_note_id, beforeNote.note_position, now, noteTreeId]);
+
+        await sync_table.addNoteTreeSync(noteTreeId, sourceId);
+    });
+
+    res.send({ success: true });
+}));
+
+router.put('/:noteTreeId/move-after/:afterNoteTreeId', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const noteTreeId = req.params.noteTreeId;
+    const afterNoteTreeId = req.params.afterNoteTreeId;
+    const sourceId = req.headers.source_id;
+
+    const noteToMove = await tree.getNoteTree(noteTreeId);
+    const afterNote = await tree.getNoteTree(afterNoteTreeId);
+
+    if (!await tree.validateParentChild(res, afterNote.parent_note_id, noteToMove.note_id, noteTreeId)) {
+        return;
+    }
+
+    await sql.doInTransaction(async () => {
+        // we don't change date_modified so other changes are prioritized in case of conflict
+        // also we would have to sync all those modified note trees otherwise hash checks would fail
+        await sql.execute("UPDATE notes_tree SET note_position = note_position + 1 WHERE parent_note_id = ? AND note_position > ? AND is_deleted = 0",
+            [afterNote.parent_note_id, afterNote.note_position]);
+
+        await sync_table.addNoteReorderingSync(afterNote.parent_note_id, sourceId);
+
+        await sql.execute("UPDATE notes_tree SET parent_note_id = ?, note_position = ?, date_modified = ? WHERE note_tree_id = ?",
+            [afterNote.parent_note_id, afterNote.note_position + 1, utils.nowDate(), noteTreeId]);
+
+        await sync_table.addNoteTreeSync(noteTreeId, sourceId);
+    });
+
+    res.send({ success: true });
+}));
+
+router.put('/:noteTreeId/expanded/:expanded', auth.checkApiAuth, wrap(async (req, res, next) => {
+    const noteTreeId = req.params.noteTreeId;
+    const expanded = req.params.expanded;
+
+    await sql.doInTransaction(async () => {
+        await sql.execute("UPDATE notes_tree SET is_expanded = ? WHERE note_tree_id = ?", [expanded, noteTreeId]);
+
+        // we don't sync expanded attribute
+    });
+
+    res.send({});
+}));
+
+router.delete('/:noteTreeId', auth.checkApiAuth, wrap(async (req, res, next) => {
+    await sql.doInTransaction(async () => {
+        await notes.deleteNote(req.params.noteTreeId, req.headers.source_id);
+    });
+
+    res.send({});
+}));
+
+module.exports = router;

routes/routes.js

@@ -7,7 +7,8 @@ const setupRoute = require('./setup');
 // API routes
 const treeApiRoute = require('./api/tree');
 const notesApiRoute = require('./api/notes');
-const notesMoveApiRoute = require('./api/notes_move');
+const treeChangesApiRoute = require('./api/tree_changes');
+const cloningApiRoute = require('./api/cloning');
 const noteHistoryApiRoute = require('./api/note_history');
 const recentChangesApiRoute = require('./api/recent_changes');
 const settingsApiRoute = require('./api/settings');
@@ -25,6 +26,7 @@ const sqlRoute = require('./api/sql');
 const anonymizationRoute = require('./api/anonymization');
 const cleanupRoute = require('./api/cleanup');
 const imageRoute = require('./api/image');
+const attributesRoute = require('./api/attributes');
 
 function register(app) {
     app.use('/', indexRoute);
@@ -35,7 +37,9 @@ function register(app) {
 
     app.use('/api/tree', treeApiRoute);
     app.use('/api/notes', notesApiRoute);
-    app.use('/api/notes', notesMoveApiRoute);
+    app.use('/api/tree', treeChangesApiRoute);
+    app.use('/api/notes', cloningApiRoute);
+    app.use('/api/notes', attributesRoute);
     app.use('/api/notes-history', noteHistoryApiRoute);
     app.use('/api/recent-changes', recentChangesApiRoute);
     app.use('/api/settings', settingsApiRoute);

services/app_info.js

@@ -3,7 +3,7 @@
 const build = require('./build');
 const packageJson = require('../package');
 
-const APP_DB_VERSION = 65;
+const APP_DB_VERSION = 67;
 
 module.exports = {
     app_version: packageJson.version,

services/attributes.js

@@ -0,0 +1,31 @@
+"use strict";
+
+const sql = require('./sql');
+const utils = require('./utils');
+const sync_table = require('./sync_table');
+
+async function getNoteIdWithAttribute(name, value) {
+    return await sql.getFirstValue(`SELECT notes.note_id FROM notes JOIN attributes USING(note_id) 
+          WHERE notes.is_deleted = 0 AND attributes.name = ? AND attributes.value = ?`, [name, value]);
+}
+
+async function createAttribute(noteId, name, value = null, sourceId = null) {
+    const now = utils.nowDate();
+    const attributeId = utils.newAttributeId();
+
+    await sql.insert("attributes", {
+        attribute_id: attributeId,
+        note_id: noteId,
+        name: name,
+        value: value,
+        date_modified: now,
+        date_created: now
+    });
+
+    await sync_table.addAttributeSync(attributeId, sourceId);
+}
+
+module.exports = {
+    getNoteIdWithAttribute,
+    createAttribute
+};

services/backup.js

@@ -23,9 +23,8 @@ async function regularBackup() {
 
 async function backupNow() {
     // we don't want to backup DB in the middle of sync with potentially inconsistent DB state
-    const releaseMutex = await sync_mutex.acquire();
 
-    try {
+    await sync_mutex.doExclusively(async () => {
         const now = utils.nowDate();
 
         const backupFile = dataDir.BACKUP_DIR + "/" + "backup-" + utils.getDateTimeForFile() + ".db";
@@ -37,10 +36,7 @@ async function backupNow() {
         await sql.doInTransaction(async () => {
             await options.setOption('last_backup_date', now);
         });
-    }
-    finally {
-        releaseMutex();
-    }
+    });
 }
 
 async function cleanupOldBackups() {

services/build.js

@@ -1 +1 @@
-module.exports = { build_date:"2018-01-07T10:04:46-05:00", build_revision: "488e657cc43fab879662a6da23b5a69dd7591b06" };
+module.exports = { build_date:"2018-01-17T23:59:03-05:00", build_revision: "651a9fb3272c85d287c16d5a4978464fb7d2490d" };

services/consistency_checks.js

@@ -121,15 +121,15 @@ async function runAllChecks() {
 
     await runCheck(`
           SELECT 
-            child.note_id 
+            child.note_tree_id
           FROM 
-            notes_tree 
-            JOIN notes AS child ON child.note_id = notes_tree.note_id 
-            JOIN notes AS parent ON notes_tree.parent_note_id = parent.note_id 
+            notes_tree AS child
           WHERE 
-            parent.is_deleted = 1 
-            AND child.is_deleted = 0`,
-        "Parent note is deleted but child note is not for these child note IDs", errorList);
+            child.is_deleted = 0
+            AND child.parent_note_id != 'root'
+            AND (SELECT COUNT(*) FROM notes_tree AS parent WHERE parent.note_id = child.parent_note_id 
+                                                                 AND parent.is_deleted = 0) = 0`,
+        "All parent note trees are deleted but child note tree is not for these child note tree IDs", errorList);
 
     // we do extra JOIN to eliminate orphan notes without note tree (which are reported separately)
     await runCheck(`
@@ -187,6 +187,17 @@ async function runAllChecks() {
             notes_image.note_image_id IS NULL`,
         "Image with no note relation", errorList);
 
+    await runCheck(`
+          SELECT 
+            notes_image.note_image_id
+          FROM 
+            notes_image
+            JOIN images USING(image_id)
+          WHERE 
+            notes_image.is_deleted = 0
+            AND images.is_deleted = 1`,
+        "Note image is not deleted while image is deleted for note_image_id", errorList);
+
     await runSyncRowChecks("notes", "note_id", errorList);
     await runSyncRowChecks("notes_history", "note_history_id", errorList);
     await runSyncRowChecks("notes_tree", "note_tree_id", errorList);
@@ -206,18 +217,14 @@ async function runAllChecks() {
 async function runChecks() {
     let errorList;
     let elapsedTimeMs;
-    const releaseMutex = await sync_mutex.acquire();
 
-    try {
+    await sync_mutex.doExclusively(async () => {
         const startTime = new Date();
 
         errorList = await runAllChecks();
 
         elapsedTimeMs = new Date().getTime() - startTime.getTime();
-    }
-    finally {
-        releaseMutex();
-    }
+    });
 
     if (errorList.length > 0) {
         log.info(`Consistency checks failed (took ${elapsedTimeMs}ms) with these errors: ` + JSON.stringify(errorList));

services/content_hash.js

@@ -16,8 +16,6 @@ function getHash(rows) {
 async function getHashes() {
     const startTime = new Date();
 
-    const optionsQuestionMarks = Array(options.SYNCED_OPTIONS.length).fill('?').join(',');
-
     const hashes = {
         notes: getHash(await sql.getAll(`
             SELECT
@@ -67,8 +65,8 @@ async function getHashes() {
              opt_name,
              opt_value 
            FROM options 
-           WHERE opt_name IN (${optionsQuestionMarks}) 
-           ORDER BY opt_name`, options.SYNCED_OPTIONS)),
+           WHERE is_synced = 1
+           ORDER BY opt_name`)),
 
         // we don't include image data on purpose because they are quite large, checksum is good enough
         // to represent the data anyway
@@ -82,7 +80,18 @@ async function getHashes() {
             date_modified,
             date_created
           FROM images  
-          ORDER BY image_id`))
+          ORDER BY image_id`)),
+
+        attributes: getHash(await sql.getAll(`
+          SELECT 
+            attribute_id,
+            note_id
+            name,
+            value
+            date_modified,
+            date_created
+          FROM attributes  
+          ORDER BY attribute_id`))
     };
 
     const elapseTimeMs = new Date().getTime() - startTime.getTime();

services/notes.js

@@ -37,7 +37,7 @@ async function createNewNote(parentNoteId, note, sourceId) {
         await sql.insert("notes", {
             note_id: noteId,
             note_title: note.note_title,
-            note_text: '',
+            note_text: note.note_text ? note.note_text : '',
             date_created: now,
             date_modified: now,
             is_protected: note.is_protected
@@ -243,6 +243,12 @@ async function updateNote(noteId, newNote, dataKey, sourceId) {
 }
 
 async function deleteNote(noteTreeId, sourceId) {
+    const noteTree = await sql.getFirstOrNull("SELECT * FROM notes_tree WHERE note_tree_id = ?", [noteTreeId]);
+
+    if (!noteTree || noteTree.is_deleted === 1) {
+        return;
+    }
+
     const now = utils.nowDate();
 
     await sql.execute("UPDATE notes_tree SET is_deleted = 1, date_modified = ? WHERE note_tree_id = ?", [now, noteTreeId]);

services/options.js

@@ -3,12 +3,12 @@ const utils = require('./utils');
 const sync_table = require('./sync_table');
 const app_info = require('./app_info');
 
-const SYNCED_OPTIONS = [ 'username', 'password_verification_hash', 'password_verification_salt',
-    'password_derived_key_salt', 'encrypted_data_key', 'encrypted_data_key_iv',
-    'protected_session_timeout', 'history_snapshot_time_interval' ];
+async function getOptionOrNull(optName) {
+    return await sql.getFirstOrNull("SELECT opt_value FROM options WHERE opt_name = ?", [optName]);
+}
 
 async function getOption(optName) {
-    const row = await sql.getFirstOrNull("SELECT opt_value FROM options WHERE opt_name = ?", [optName]);
+    const row = await getOptionOrNull(optName);
 
     if (!row) {
         throw new Error("Option " + optName + " doesn't exist");
@@ -17,43 +17,59 @@ async function getOption(optName) {
     return row['opt_value'];
 }
 
-async function setOption(optName, optValue, sourceId) {
-    if (SYNCED_OPTIONS.includes(optName)) {
+async function setOption(optName, optValue, sourceId = null) {
+    const opt = await sql.getFirst("SELECT * FROM options WHERE opt_name = ?", [optName]);
+
+    if (!opt) {
+        throw new Error(`Option ${optName} doesn't exist`);
+    }
+
+    if (opt.is_synced) {
         await sync_table.addOptionsSync(optName, sourceId);
     }
 
-    await sql.replace("options", {
+    await sql.execute("UPDATE options SET opt_value = ?, date_modified = ? WHERE opt_name = ?",
+        [optValue, utils.nowDate(), optName]);
+}
+
+async function createOption(optName, optValue, isSynced, sourceId = null) {
+    await sql.insert("options", {
         opt_name: optName,
         opt_value: optValue,
+        is_synced: isSynced,
         date_modified: utils.nowDate()
     });
+
+    if (isSynced) {
+        await sync_table.addOptionsSync(optName, sourceId);
+    }
 }
 
 async function initOptions(startNotePath) {
-    await setOption('document_id', utils.randomSecureToken(16));
-    await setOption('document_secret', utils.randomSecureToken(16));
+    await createOption('document_id', utils.randomSecureToken(16), false);
+    await createOption('document_secret', utils.randomSecureToken(16), false);
 
-    await setOption('username', '');
-    await setOption('password_verification_hash', '');
-    await setOption('password_verification_salt', '');
-    await setOption('password_derived_key_salt', '');
-    await setOption('encrypted_data_key', '');
-    await setOption('encrypted_data_key_iv', '');
+    await createOption('username', '', true);
+    await createOption('password_verification_hash', '', true);
+    await createOption('password_verification_salt', '', true);
+    await createOption('password_derived_key_salt', '', true);
+    await createOption('encrypted_data_key', '', true);
+    await createOption('encrypted_data_key_iv', '', true);
 
-    await setOption('start_note_path', startNotePath);
-    await setOption('protected_session_timeout', 600);
-    await setOption('history_snapshot_time_interval', 600);
-    await setOption('last_backup_date', utils.nowDate());
-    await setOption('db_version', app_info.db_version);
+    await createOption('start_note_path', startNotePath, false);
+    await createOption('protected_session_timeout', 600, true);
+    await createOption('history_snapshot_time_interval', 600, true);
+    await createOption('last_backup_date', utils.nowDate(), false);
+    await createOption('db_version', app_info.db_version, false);
 
-    await setOption('last_synced_pull', app_info.db_version);
-    await setOption('last_synced_push', 0);
-    await setOption('last_synced_push', 0);
+    await createOption('last_synced_pull', app_info.db_version, false);
+    await createOption('last_synced_push', 0, false);
 }
 
 module.exports = {
     getOption,
+    getOptionOrNull,
     setOption,
     initOptions,
-    SYNCED_OPTIONS
+    createOption
 };

services/sql.js

@@ -31,11 +31,15 @@ const dbReady = new Promise((resolve, reject) => {
             const schema = fs.readFileSync(resource_dir.DB_INIT_DIR + '/schema.sql', 'UTF-8');
             const notesSql = fs.readFileSync(resource_dir.DB_INIT_DIR + '/main_notes.sql', 'UTF-8');
             const notesTreeSql = fs.readFileSync(resource_dir.DB_INIT_DIR + '/main_notes_tree.sql', 'UTF-8');
+            const imagesSql = fs.readFileSync(resource_dir.DB_INIT_DIR + '/main_images.sql', 'UTF-8');
+            const notesImageSql = fs.readFileSync(resource_dir.DB_INIT_DIR + '/main_notes_image.sql', 'UTF-8');
 
             await doInTransaction(async () => {
                 await executeScript(schema);
                 await executeScript(notesSql);
                 await executeScript(notesTreeSql);
+                await executeScript(imagesSql);
+                await executeScript(notesImageSql);
 
                 const startNoteId = await getFirstValue("SELECT note_id FROM notes_tree WHERE parent_note_id = 'root' AND is_deleted = 0 ORDER BY note_position");
 

services/sync.js

@@ -20,25 +20,25 @@ let proxyToggle = true;
 let syncServerCertificate = null;
 
 async function sync() {
-    const releaseMutex = await sync_mutex.acquire();
-
     try {
-        if (!await sql.isDbUpToDate()) {
-            return {
-                success: false,
-                message: "DB not up to date"
-            };
-        }
+        await sync_mutex.doExclusively(async () => {
+            if (!await sql.isDbUpToDate()) {
+                return {
+                    success: false,
+                    message: "DB not up to date"
+                };
+            }
 
-        const syncContext = await login();
+            const syncContext = await login();
 
-        await pushSync(syncContext);
+            await pushSync(syncContext);
 
-        await pullSync(syncContext);
+            await pullSync(syncContext);
 
-        await pushSync(syncContext);
+            await pushSync(syncContext);
 
-        await checkContentHash(syncContext);
+            await checkContentHash(syncContext);
+        });
 
         return {
             success: true
@@ -64,9 +64,6 @@ async function sync() {
             }
         }
     }
-    finally {
-        releaseMutex();
-    }
 }
 
 async function login() {
@@ -149,6 +146,9 @@ async function pullSync(syncContext) {
         else if (sync.entity_name === 'notes_image') {
             await syncUpdate.updateNoteImage(resp, syncContext.sourceId);
         }
+        else if (sync.entity_name === 'attributes') {
+            await syncUpdate.updateAttribute(resp, syncContext.sourceId);
+        }
         else {
             throw new Error(`Unrecognized entity type ${sync.entity_name} in sync #${sync.id}`);
         }
@@ -230,6 +230,9 @@ async function pushEntity(sync, syncContext) {
     else if (sync.entity_name === 'notes_image') {
         entity = await sql.getFirst('SELECT * FROM notes_image WHERE note_image_id = ?', [sync.entity_id]);
     }
+    else if (sync.entity_name === 'attributes') {
+        entity = await sql.getFirst('SELECT * FROM attributes WHERE attribute_id = ?', [sync.entity_id]);
+    }
     else {
         throw new Error(`Unrecognized entity type ${sync.entity_name} in sync #${sync.id}`);
     }

services/sync_mutex.js

@@ -4,5 +4,20 @@
  */
 
 const Mutex = require('async-mutex').Mutex;
+const instance = new Mutex();
 
-module.exports = new Mutex();
+async function doExclusively(func) {
+    const releaseMutex = await instance.acquire();
+
+    try {
+        await func();
+    }
+    finally {
+        releaseMutex();
+    }
+
+}
+
+module.exports = {
+    doExclusively
+};

services/sync_table.js

@@ -36,6 +36,10 @@ async function addNoteImageSync(noteImageId, sourceId) {
     await addEntitySync("notes_image", noteImageId, sourceId);
 }
 
+async function addAttributeSync(attributeId, sourceId) {
+    await addEntitySync("attributes", attributeId, sourceId);
+}
+
 async function addEntitySync(entityName, entityId, sourceId) {
     await sql.replace("sync", {
         entity_name: entityName,
@@ -88,6 +92,7 @@ async function fillAllSyncRows() {
     await fillSyncRows("recent_notes", "note_tree_id");
     await fillSyncRows("images", "image_id");
     await fillSyncRows("notes_image", "note_image_id");
+    await fillSyncRows("attributes", "attribute_id");
 }
 
 module.exports = {
@@ -99,6 +104,7 @@ module.exports = {
     addRecentNoteSync,
     addImageSync,
     addNoteImageSync,
+    addAttributeSync,
     cleanupSyncRowsForMissingEntities,
     fillAllSyncRows
 };

services/sync_update.js

@@ -1,6 +1,5 @@
 const sql = require('./sql');
 const log = require('./log');
-const options = require('./options');
 const eventLog = require('./event_log');
 const notes = require('./notes');
 const sync_table = require('./sync_table');
@@ -63,12 +62,12 @@ async function updateNoteReordering(entity, sourceId) {
 }
 
 async function updateOptions(entity, sourceId) {
-    if (!options.SYNCED_OPTIONS.includes(entity.opt_name)) {
+    const orig = await sql.getFirstOrNull("SELECT * FROM options WHERE opt_name = ?", [entity.opt_name]);
+
+    if (!orig.is_synced) {
         return;
     }
 
-    const orig = await sql.getFirstOrNull("SELECT * FROM options WHERE opt_name = ?", [entity.opt_name]);
-
     await sql.doInTransaction(async () => {
         if (orig === null || orig.date_modified < entity.date_modified) {
             await sql.replace('options', entity);
@@ -124,6 +123,20 @@ async function updateNoteImage(entity, sourceId) {
     }
 }
 
+async function updateAttribute(entity, sourceId) {
+    const origAttribute = await sql.getFirst("SELECT * FROM attributes WHERE attribute_id = ?", [entity.attribute_id]);
+
+    if (!origAttribute || origAttribute.date_modified <= entity.date_modified) {
+        await sql.doInTransaction(async () => {
+            await sql.replace("attributes", entity);
+
+            await sync_table.addAttributeSync(entity.attribute_id, sourceId);
+        });
+
+        log.info("Update/sync attribute " + entity.attribute_id);
+    }
+}
+
 module.exports = {
     updateNote,
     updateNoteTree,
@@ -132,5 +145,6 @@ module.exports = {
     updateOptions,
     updateRecentNotes,
     updateImage,
-    updateNoteImage
+    updateNoteImage,
+    updateAttribute
 };

services/tree.js

@@ -0,0 +1,114 @@
+"use strict";
+
+const sql = require('./sql');
+const sync_table = require('./sync_table');
+const data_encryption = require('./data_encryption');
+
+async function validateParentChild(res, parentNoteId, childNoteId, noteTreeId = null) {
+    const existing = await getExistingNoteTree(parentNoteId, childNoteId);
+
+    if (existing && (noteTreeId === null || existing.note_tree_id !== noteTreeId)) {
+        res.send({
+            success: false,
+            message: 'This note already exists in the target.'
+        });
+
+        return false;
+    }
+
+    if (!await checkTreeCycle(parentNoteId, childNoteId)) {
+        res.send({
+            success: false,
+            message: 'Moving note here would create cycle.'
+        });
+
+        return false;
+    }
+
+    return true;
+}
+
+async function getExistingNoteTree(parentNoteId, childNoteId) {
+    return await sql.getFirst('SELECT * FROM notes_tree WHERE note_id = ? AND parent_note_id = ? AND is_deleted = 0', [childNoteId, parentNoteId]);
+}
+
+/**
+ * Tree cycle can be created when cloning or when moving existing clone. This method should detect both cases.
+ */
+async function checkTreeCycle(parentNoteId, childNoteId) {
+    const subTreeNoteIds = [];
+
+    // we'll load the whole sub tree - because the cycle can start in one of the notes in the sub tree
+    await loadSubTreeNoteIds(childNoteId, subTreeNoteIds);
+
+    async function checkTreeCycleInner(parentNoteId) {
+        if (parentNoteId === 'root') {
+            return true;
+        }
+
+        if (subTreeNoteIds.includes(parentNoteId)) {
+            // while towards the root of the tree we encountered noteId which is already present in the subtree
+            // joining parentNoteId with childNoteId would then clearly create a cycle
+            return false;
+        }
+
+        const parentNoteIds = await sql.getFirstColumn("SELECT DISTINCT parent_note_id FROM notes_tree WHERE note_id = ? AND is_deleted = 0", [parentNoteId]);
+
+        for (const pid of parentNoteIds) {
+            if (!await checkTreeCycleInner(pid)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    return await checkTreeCycleInner(parentNoteId);
+}
+
+async function getNoteTree(noteTreeId) {
+    return sql.getFirst("SELECT * FROM notes_tree WHERE note_tree_id = ?", [noteTreeId]);
+}
+
+async function loadSubTreeNoteIds(parentNoteId, subTreeNoteIds) {
+    subTreeNoteIds.push(parentNoteId);
+
+    const children = await sql.getFirstColumn("SELECT note_id FROM notes_tree WHERE parent_note_id = ? AND is_deleted = 0", [parentNoteId]);
+
+    for (const childNoteId of children) {
+        await loadSubTreeNoteIds(childNoteId, subTreeNoteIds);
+    }
+}
+
+async function sortNotesAlphabetically(parentNoteId, dataKey, sourceId) {
+    await sql.doInTransaction(async () => {
+        const notes = await sql.getAll(`SELECT note_tree_id, note_id, note_title, is_protected 
+                                       FROM notes JOIN notes_tree USING(note_id) 
+                                       WHERE notes_tree.is_deleted = 0 AND parent_note_id = ?`, [parentNoteId]);
+
+        for (const note of notes) {
+            if (note.is_protected) {
+                note.note_title = data_encryption.decryptString(dataKey, data_encryption.noteTitleIv(note.note_id), note.note_title);
+            }
+        }
+
+        notes.sort((a, b) => a.note_title.toLowerCase() < b.note_title.toLowerCase() ? -1 : 1);
+
+        let position = 1;
+
+        for (const note of notes) {
+            await sql.execute("UPDATE notes_tree SET note_position = ? WHERE note_tree_id = ?",
+                [position, note.note_tree_id]);
+
+            position++;
+        }
+
+        await sync_table.addNoteReorderingSync(parentNoteId, sourceId);
+    });
+}
+
+module.exports = {
+    validateParentChild,
+    getNoteTree,
+    sortNotesAlphabetically
+};

services/utils.js

@@ -23,6 +23,10 @@ function newNoteImageId() {
     return randomString(12);
 }
 
+function newAttributeId() {
+    return randomString(12);
+}
+
 function randomString(length) {
     return randtoken.generate(length);
 }
@@ -95,6 +99,16 @@ function assertArguments() {
     }
 }
 
+async function stopWatch(what, func) {
+    const start = new Date();
+
+    await func();
+
+    const tookMs = new Date().getTime() - start.getTime();
+
+    console.log(`${what} took ${tookMs}ms`);
+}
+
 module.exports = {
     randomSecureToken,
     randomString,
@@ -106,6 +120,7 @@ module.exports = {
     newNoteHistoryId,
     newImageId,
     newNoteImageId,
+    newAttributeId,
     toBase64,
     fromBase64,
     hmac,
@@ -114,5 +129,6 @@ module.exports = {
     isEmptyOrWhitespace,
     getDateTimeForFile,
     sanitizeSql,
-    assertArguments
+    assertArguments,
+    stopWatch
 };

views/index.ejs

@@ -248,12 +248,24 @@
           <p>This action will create a new copy of the database and anonymise it (remove all note content and leave only structure and metadata)
             for sharing online for debugging purposes without fear of leaking your personal data.</p>
 
-          <h4>Cleanup</h4>
+          <h4>Image cleanup</h4>
 
-          <button id="cleanup-soft-deleted-items-button" class="btn btn-danger btn-sm">Permanently cleanup soft-deleted items</button> (should be executed in all synced instances)
+          <p>This will remove all image data of images not used in any current version of note from the database (metadata will remain).
 
-          <br/>
-          <br/>
+            This means that some images can disappear from note history.</p>
+
+          <button id="cleanup-unused-images-button" class="btn btn-warning btn-sm">Permanently cleanup unused images</button>
+
+          <h4>Soft-delete cleanup</h4>
+
+          <p>This deletes all soft deleted rows from the database. This change isn't synced and should be done manually on all instances.
+            <strong>Use this only if you really know what you're doing.</strong></p>
+
+          <button id="cleanup-soft-deleted-items-button" class="btn btn-danger btn-sm">Permanently cleanup soft-deleted items</button>
+
+          <h4>Vacuum database</h4>
+
+          <p>This will rebuild database which will typically result in smaller database file. No data will be actually changed.</p>
 
           <button id="vacuum-database-button" class="btn btn-sm">Vacuum database</button>
         </div>
@@ -328,6 +340,37 @@
       <textarea id="note-source" readonly="readonly"></textarea>
     </div>
 
+    <div id="attributes-dialog" title="Note attributes" style="display: none; padding: 20px;">
+      <div style="display: flex; justify-content: space-between; padding: 15px; padding-top: 0;">
+        <button class="btn-default" data-bind="click: addNewRow">Add new attribute</button>
+
+        <button class="btn-primary" data-bind="click: save">Save</button>
+      </div>
+
+      <div style="height: 97%; overflow: auto">
+        <table id="attributes-table" class="table">
+          <thead>
+            <tr>
+              <th>ID</th>
+              <th>Name</th>
+              <th>Value</th>
+            </tr>
+          </thead>
+          <tbody data-bind="foreach: attributes">
+            <tr>
+              <td data-bind="text: attribute_id"></td>
+              <td>
+                <input type="text" data-bind="value: name"/>
+              </td>
+              <td>
+                <input type="text" data-bind="value: value" style="width: 300px"/>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+
     <div id="tooltip" style="display: none;"></div>
 
     <script type="text/javascript">
@@ -364,6 +407,8 @@
 
     <script src="libraries/jquery.ui-contextmenu.min.js"></script>
 
+    <script src="libraries/knockout.min.js"></script>
+
     <link href="stylesheets/style.css" rel="stylesheet">
 
     <script src="javascripts/utils.js"></script>
@@ -373,6 +418,7 @@
     <!-- Tree scripts -->
     <script src="javascripts/note_tree.js"></script>
     <script src="javascripts/tree_changes.js"></script>
+    <script src="javascripts/cloning.js"></script>
     <script src="javascripts/tree_utils.js"></script>
     <script src="javascripts/drag_and_drop.js"></script>
     <script src="javascripts/context_menu.js"></script>
@@ -393,6 +439,7 @@
     <script src="javascripts/dialogs/edit_tree_prefix.js"></script>
     <script src="javascripts/dialogs/sql_console.js"></script>
     <script src="javascripts/dialogs/note_source.js"></script>
+    <script src="javascripts/dialogs/attributes.js"></script>
 
     <script src="javascripts/link.js"></script>
     <script src="javascripts/sync.js"></script>