release 0.36.2

fix creating branch without isExpanded, fixes initial document initialization
final fix for the ws issue
2019-10-31 22:04:44 +01:00 · 2019-10-31 22:02:55 +01:00 · 2019-10-30 19:43:17 +01:00 · 2019-10-29 20:54:08 +01:00 · 2019-10-29 20:19:28 +01:00 · 2019-10-29 19:59:19 +01:00
301 changed files with 12818 additions and 23412 deletions
@@ -7,3 +7,4 @@ yarn-error.log
 config.ini
 cert.key
 cert.crt
+server-package.json
@@ -0,0 +1,15 @@
+FROM gitpod/workspace-full
+
+RUN sudo apt-get update \
+    && sudo apt-get install -yq --no-install-recommends \
+        libpng16-16 \
+        libpng-dev \
+        pkg-config \
+        autoconf \
+        libtool \
+        build-essential \
+        nasm \
+        libx11-dev \
+        libxkbfile-dev \
+    && sudo rm -rf /var/lib/apt/lists/*
+
@@ -1,7 +1,11 @@
+image:
+  file: .gitpod.dockerfile
+
 tasks:
    - before: nvm install 10 && nvm use 10
      init: npm install
-      command: npm run start
+      command: npm run start-server
+
 ports:
    - port: 8080
      onOpen: open-preview
@@ -6,5 +6,8 @@
        <option name="TAB_SIZE" value="2" />
      </value>
    </option>
+    <JSCodeStyleSettings version="0">
+      <option name="USE_EXPLICIT_JS_EXTENSION" value="TRUE" />
+    </JSCodeStyleSettings>
  </code_scheme>
 </component>
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="document.db">
-  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.15">
+  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.16">
    <root id="1">
      <ServerVersion>3.25.1</ServerVersion>
    </root>
    <schema id="2" parent="1" name="main">
      <Current>1</Current>
-      <Visible>1</Visible>
    </schema>
    <collation id="3" parent="1" name="BINARY"/>
    <collation id="4" parent="1" name="NOCASE"/>
@@ -15,634 +14,575 @@
    <table id="7" parent="2" name="attributes"/>
    <table id="8" parent="2" name="branches"/>
    <table id="9" parent="2" name="event_log"/>
-    <table id="10" parent="2" name="links"/>
-    <table id="11" parent="2" name="note_contents"/>
-    <table id="12" parent="2" name="note_revisions"/>
-    <table id="13" parent="2" name="notes"/>
-    <table id="14" parent="2" name="options"/>
-    <table id="15" parent="2" name="recent_notes"/>
-    <table id="16" parent="2" name="source_ids"/>
-    <table id="17" parent="2" name="sqlite_master">
+    <table id="10" parent="2" name="note_contents"/>
+    <table id="11" parent="2" name="note_revisions"/>
+    <table id="12" parent="2" name="notes"/>
+    <table id="13" parent="2" name="options"/>
+    <table id="14" parent="2" name="recent_notes"/>
+    <table id="15" parent="2" name="source_ids"/>
+    <table id="16" parent="2" name="sqlite_master">
      <System>1</System>
    </table>
-    <table id="18" parent="2" name="sqlite_sequence">
+    <table id="17" parent="2" name="sqlite_sequence">
      <System>1</System>
    </table>
-    <table id="19" parent="2" name="sync"/>
-    <column id="20" parent="6" name="apiTokenId">
+    <table id="18" parent="2" name="sync"/>
+    <column id="19" parent="6" name="apiTokenId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="21" parent="6" name="token">
+    <column id="20" parent="6" name="token">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="22" parent="6" name="utcDateCreated">
+    <column id="21" parent="6" name="utcDateCreated">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="23" parent="6" name="isDeleted">
+    <column id="22" parent="6" name="isDeleted">
      <Position>4</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
-    <column id="24" parent="6" name="hash">
+    <column id="23" parent="6" name="hash">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
-    <index id="25" parent="6" name="sqlite_autoindex_api_tokens_1">
+    <index id="24" parent="6" name="sqlite_autoindex_api_tokens_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>apiTokenId</ColNames>
      <Unique>1</Unique>
    </index>
-    <key id="26" parent="6">
+    <key id="25" parent="6">
      <ColNames>apiTokenId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_api_tokens_1</UnderlyingIndexName>
    </key>
-    <column id="27" parent="7" name="attributeId">
+    <column id="26" parent="7" name="attributeId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="28" parent="7" name="noteId">
+    <column id="27" parent="7" name="noteId">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="29" parent="7" name="type">
+    <column id="28" parent="7" name="type">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="30" parent="7" name="name">
+    <column id="29" parent="7" name="name">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="31" parent="7" name="value">
+    <column id="30" parent="7" name="value">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;&apos;</DefaultExpression>
    </column>
-    <column id="32" parent="7" name="position">
+    <column id="31" parent="7" name="position">
      <Position>6</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
-    <column id="33" parent="7" name="utcDateCreated">
+    <column id="32" parent="7" name="utcDateCreated">
      <Position>7</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="34" parent="7" name="utcDateModified">
+    <column id="33" parent="7" name="utcDateModified">
      <Position>8</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="35" parent="7" name="isDeleted">
+    <column id="34" parent="7" name="isDeleted">
      <Position>9</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="36" parent="7" name="hash">
+    <column id="35" parent="7" name="hash">
      <Position>10</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
-    <column id="37" parent="7" name="isInheritable">
+    <column id="36" parent="7" name="isInheritable">
      <Position>11</Position>
      <DataType>int|0s</DataType>
      <DefaultExpression>0</DefaultExpression>
    </column>
-    <index id="38" parent="7" name="sqlite_autoindex_attributes_1">
+    <index id="37" parent="7" name="sqlite_autoindex_attributes_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>attributeId</ColNames>
      <Unique>1</Unique>
    </index>
-    <index id="39" parent="7" name="IDX_attributes_noteId_index">
+    <index id="38" parent="7" name="IDX_attributes_noteId_index">
      <ColNames>noteId</ColNames>
    </index>
-    <index id="40" parent="7" name="IDX_attributes_name_value">
+    <index id="39" parent="7" name="IDX_attributes_name_value">
      <ColNames>name
 value</ColNames>
    </index>
-    <index id="41" parent="7" name="IDX_attributes_name_index">
+    <index id="40" parent="7" name="IDX_attributes_name_index">
      <ColNames>name</ColNames>
    </index>
-    <index id="42" parent="7" name="IDX_attributes_value_index">
+    <index id="41" parent="7" name="IDX_attributes_value_index">
      <ColNames>value</ColNames>
    </index>
-    <key id="43" parent="7">
+    <key id="42" parent="7">
      <ColNames>attributeId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_attributes_1</UnderlyingIndexName>
    </key>
-    <column id="44" parent="8" name="branchId">
+    <column id="43" parent="8" name="branchId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="45" parent="8" name="noteId">
+    <column id="44" parent="8" name="noteId">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="46" parent="8" name="parentNoteId">
+    <column id="45" parent="8" name="parentNoteId">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="47" parent="8" name="notePosition">
+    <column id="46" parent="8" name="notePosition">
      <Position>4</Position>
      <DataType>INTEGER|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="48" parent="8" name="prefix">
+    <column id="47" parent="8" name="prefix">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
    </column>
-    <column id="49" parent="8" name="isExpanded">
+    <column id="48" parent="8" name="isExpanded">
      <Position>6</Position>
      <DataType>BOOLEAN|0s</DataType>
    </column>
-    <column id="50" parent="8" name="isDeleted">
+    <column id="49" parent="8" name="isDeleted">
      <Position>7</Position>
      <DataType>INTEGER|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
-    <column id="51" parent="8" name="utcDateModified">
+    <column id="50" parent="8" name="utcDateModified">
      <Position>8</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="52" parent="8" name="utcDateCreated">
+    <column id="51" parent="8" name="utcDateCreated">
      <Position>9</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="53" parent="8" name="hash">
+    <column id="52" parent="8" name="hash">
      <Position>10</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
-    <index id="54" parent="8" name="sqlite_autoindex_branches_1">
+    <index id="53" parent="8" name="sqlite_autoindex_branches_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>branchId</ColNames>
      <Unique>1</Unique>
    </index>
-    <index id="55" parent="8" name="IDX_branches_noteId_parentNoteId">
+    <index id="54" parent="8" name="IDX_branches_noteId_parentNoteId">
      <ColNames>noteId
 parentNoteId</ColNames>
    </index>
-    <index id="56" parent="8" name="IDX_branches_noteId">
+    <index id="55" parent="8" name="IDX_branches_noteId">
      <ColNames>noteId</ColNames>
    </index>
-    <index id="57" parent="8" name="IDX_branches_parentNoteId">
+    <index id="56" parent="8" name="IDX_branches_parentNoteId">
      <ColNames>parentNoteId</ColNames>
    </index>
-    <key id="58" parent="8">
+    <key id="57" parent="8">
      <ColNames>branchId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_branches_1</UnderlyingIndexName>
    </key>
-    <column id="59" parent="9" name="eventId">
+    <column id="58" parent="9" name="eventId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="60" parent="9" name="noteId">
+    <column id="59" parent="9" name="noteId">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
    </column>
-    <column id="61" parent="9" name="comment">
+    <column id="60" parent="9" name="comment">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
    </column>
-    <column id="62" parent="9" name="utcDateCreated">
+    <column id="61" parent="9" name="utcDateCreated">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <index id="63" parent="9" name="sqlite_autoindex_event_log_1">
+    <index id="62" parent="9" name="sqlite_autoindex_event_log_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>eventId</ColNames>
      <Unique>1</Unique>
    </index>
-    <key id="64" parent="9">
+    <key id="63" parent="9">
      <ColNames>eventId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_event_log_1</UnderlyingIndexName>
    </key>
-    <column id="65" parent="10" name="linkId">
+    <column id="64" parent="10" name="noteId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="66" parent="10" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="67" parent="10" name="targetNoteId">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="68" parent="10" name="type">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="69" parent="10" name="hash">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="70" parent="10" name="isDeleted">
-      <Position>6</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="71" parent="10" name="utcDateCreated">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="72" parent="10" name="utcDateModified">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="73" parent="10" name="sqlite_autoindex_links_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>linkId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="74" parent="10" name="IDX_links_noteId_index">
-      <ColNames>noteId</ColNames>
-    </index>
-    <index id="75" parent="10" name="IDX_links_targetNoteId_index">
-      <ColNames>targetNoteId</ColNames>
-    </index>
-    <key id="76" parent="10">
-      <ColNames>linkId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_links_1</UnderlyingIndexName>
-    </key>
-    <column id="77" parent="11" name="noteId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="78" parent="11" name="content">
+    <column id="65" parent="10" name="content">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <DefaultExpression>NULL</DefaultExpression>
    </column>
-    <column id="79" parent="11" name="hash">
+    <column id="66" parent="10" name="hash">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
-    <column id="80" parent="11" name="utcDateModified">
+    <column id="67" parent="10" name="utcDateModified">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <index id="81" parent="11" name="sqlite_autoindex_note_contents_1">
+    <index id="68" parent="10" name="sqlite_autoindex_note_contents_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>noteId</ColNames>
      <Unique>1</Unique>
    </index>
-    <key id="82" parent="11">
+    <key id="69" parent="10">
      <ColNames>noteId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_note_contents_1</UnderlyingIndexName>
    </key>
-    <column id="83" parent="12" name="noteRevisionId">
+    <column id="70" parent="11" name="noteRevisionId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="84" parent="12" name="noteId">
+    <column id="71" parent="11" name="noteId">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="85" parent="12" name="title">
+    <column id="72" parent="11" name="title">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
    </column>
-    <column id="86" parent="12" name="content">
+    <column id="73" parent="11" name="content">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
    </column>
-    <column id="87" parent="12" name="isProtected">
+    <column id="74" parent="11" name="isProtected">
      <Position>5</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
-    <column id="88" parent="12" name="utcDateModifiedFrom">
+    <column id="75" parent="11" name="utcDateModifiedFrom">
      <Position>6</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="89" parent="12" name="utcDateModifiedTo">
+    <column id="76" parent="11" name="utcDateModifiedTo">
      <Position>7</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="90" parent="12" name="dateModifiedFrom">
+    <column id="77" parent="11" name="dateModifiedFrom">
      <Position>8</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="91" parent="12" name="dateModifiedTo">
+    <column id="78" parent="11" name="dateModifiedTo">
      <Position>9</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="92" parent="12" name="type">
+    <column id="79" parent="11" name="type">
      <Position>10</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;&apos;</DefaultExpression>
    </column>
-    <column id="93" parent="12" name="mime">
+    <column id="80" parent="11" name="mime">
      <Position>11</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;&apos;</DefaultExpression>
    </column>
-    <column id="94" parent="12" name="hash">
+    <column id="81" parent="11" name="hash">
      <Position>12</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
-    <index id="95" parent="12" name="sqlite_autoindex_note_revisions_1">
+    <index id="82" parent="11" name="sqlite_autoindex_note_revisions_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>noteRevisionId</ColNames>
      <Unique>1</Unique>
    </index>
-    <index id="96" parent="12" name="IDX_note_revisions_noteId">
+    <index id="83" parent="11" name="IDX_note_revisions_noteId">
      <ColNames>noteId</ColNames>
    </index>
-    <index id="97" parent="12" name="IDX_note_revisions_dateModifiedFrom">
+    <index id="84" parent="11" name="IDX_note_revisions_dateModifiedFrom">
      <ColNames>utcDateModifiedFrom</ColNames>
    </index>
-    <index id="98" parent="12" name="IDX_note_revisions_dateModifiedTo">
+    <index id="85" parent="11" name="IDX_note_revisions_dateModifiedTo">
      <ColNames>utcDateModifiedTo</ColNames>
    </index>
-    <key id="99" parent="12">
+    <key id="86" parent="11">
      <ColNames>noteRevisionId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_note_revisions_1</UnderlyingIndexName>
    </key>
-    <column id="100" parent="13" name="noteId">
+    <column id="87" parent="12" name="noteId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="101" parent="13" name="title">
+    <column id="88" parent="12" name="title">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;note&quot;</DefaultExpression>
    </column>
-    <column id="102" parent="13" name="isProtected">
+    <column id="89" parent="12" name="isProtected">
      <Position>3</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
-    <column id="103" parent="13" name="type">
+    <column id="90" parent="12" name="type">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;text&apos;</DefaultExpression>
    </column>
-    <column id="104" parent="13" name="mime">
+    <column id="91" parent="12" name="mime">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;text/html&apos;</DefaultExpression>
    </column>
-    <column id="105" parent="13" name="hash">
+    <column id="92" parent="12" name="hash">
      <Position>6</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
-    <column id="106" parent="13" name="isDeleted">
+    <column id="93" parent="12" name="isDeleted">
      <Position>7</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
-    <column id="107" parent="13" name="dateCreated">
+    <column id="94" parent="12" name="dateCreated">
      <Position>8</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="108" parent="13" name="dateModified">
+    <column id="95" parent="12" name="dateModified">
      <Position>9</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="109" parent="13" name="utcDateCreated">
+    <column id="96" parent="12" name="utcDateCreated">
      <Position>10</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="110" parent="13" name="utcDateModified">
+    <column id="97" parent="12" name="utcDateModified">
      <Position>11</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <index id="111" parent="13" name="sqlite_autoindex_notes_1">
+    <index id="98" parent="12" name="sqlite_autoindex_notes_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>noteId</ColNames>
      <Unique>1</Unique>
    </index>
-    <key id="112" parent="13">
+    <key id="99" parent="12">
      <ColNames>noteId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_notes_1</UnderlyingIndexName>
    </key>
-    <column id="113" parent="14" name="name">
+    <column id="100" parent="13" name="name">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="114" parent="14" name="value">
+    <column id="101" parent="13" name="value">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
    </column>
-    <column id="115" parent="14" name="isSynced">
+    <column id="102" parent="13" name="isSynced">
      <Position>3</Position>
      <DataType>INTEGER|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
-    <column id="116" parent="14" name="hash">
+    <column id="103" parent="13" name="hash">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
-    <column id="117" parent="14" name="utcDateCreated">
+    <column id="104" parent="13" name="utcDateCreated">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="118" parent="14" name="utcDateModified">
+    <column id="105" parent="13" name="utcDateModified">
      <Position>6</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <index id="119" parent="14" name="sqlite_autoindex_options_1">
+    <index id="106" parent="13" name="sqlite_autoindex_options_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>name</ColNames>
      <Unique>1</Unique>
    </index>
-    <key id="120" parent="14">
+    <key id="107" parent="13">
      <ColNames>name</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_options_1</UnderlyingIndexName>
    </key>
-    <column id="121" parent="15" name="branchId">
+    <column id="108" parent="14" name="noteId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="122" parent="15" name="notePath">
+    <column id="109" parent="14" name="notePath">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="123" parent="15" name="hash">
+    <column id="110" parent="14" name="hash">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
-    <column id="124" parent="15" name="utcDateCreated">
+    <column id="111" parent="14" name="utcDateCreated">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="125" parent="15" name="isDeleted">
+    <column id="112" parent="14" name="isDeleted">
      <Position>5</Position>
      <DataType>INT|0s</DataType>
    </column>
-    <index id="126" parent="15" name="sqlite_autoindex_recent_notes_1">
+    <index id="113" parent="14" name="sqlite_autoindex_recent_notes_1">
      <NameSurrogate>1</NameSurrogate>
-      <ColNames>branchId</ColNames>
+      <ColNames>noteId</ColNames>
      <Unique>1</Unique>
    </index>
-    <key id="127" parent="15">
-      <ColNames>branchId</ColNames>
+    <key id="114" parent="14">
+      <ColNames>noteId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_recent_notes_1</UnderlyingIndexName>
    </key>
-    <column id="128" parent="16" name="sourceId">
+    <column id="115" parent="15" name="sourceId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="129" parent="16" name="utcDateCreated">
+    <column id="116" parent="15" name="utcDateCreated">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <index id="130" parent="16" name="sqlite_autoindex_source_ids_1">
+    <index id="117" parent="15" name="sqlite_autoindex_source_ids_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>sourceId</ColNames>
      <Unique>1</Unique>
    </index>
-    <key id="131" parent="16">
+    <key id="118" parent="15">
      <ColNames>sourceId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_source_ids_1</UnderlyingIndexName>
    </key>
-    <column id="132" parent="17" name="type">
+    <column id="119" parent="16" name="type">
      <Position>1</Position>
      <DataType>text|0s</DataType>
    </column>
-    <column id="133" parent="17" name="name">
+    <column id="120" parent="16" name="name">
      <Position>2</Position>
      <DataType>text|0s</DataType>
    </column>
-    <column id="134" parent="17" name="tbl_name">
+    <column id="121" parent="16" name="tbl_name">
      <Position>3</Position>
      <DataType>text|0s</DataType>
    </column>
-    <column id="135" parent="17" name="rootpage">
+    <column id="122" parent="16" name="rootpage">
      <Position>4</Position>
      <DataType>int|0s</DataType>
    </column>
-    <column id="136" parent="17" name="sql">
+    <column id="123" parent="16" name="sql">
      <Position>5</Position>
      <DataType>text|0s</DataType>
    </column>
-    <column id="137" parent="18" name="name">
+    <column id="124" parent="17" name="name">
      <Position>1</Position>
    </column>
-    <column id="138" parent="18" name="seq">
+    <column id="125" parent="17" name="seq">
      <Position>2</Position>
    </column>
-    <column id="139" parent="19" name="id">
+    <column id="126" parent="18" name="id">
      <Position>1</Position>
      <DataType>INTEGER|0s</DataType>
      <NotNull>1</NotNull>
      <SequenceIdentity>1</SequenceIdentity>
    </column>
-    <column id="140" parent="19" name="entityName">
+    <column id="127" parent="18" name="entityName">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="141" parent="19" name="entityId">
+    <column id="128" parent="18" name="entityId">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="142" parent="19" name="sourceId">
+    <column id="129" parent="18" name="sourceId">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <column id="143" parent="19" name="utcSyncDate">
+    <column id="130" parent="18" name="utcSyncDate">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
-    <index id="144" parent="19" name="IDX_sync_entityName_entityId">
+    <index id="131" parent="18" name="IDX_sync_entityName_entityId">
      <ColNames>entityName
 entityId</ColNames>
      <Unique>1</Unique>
    </index>
-    <index id="145" parent="19" name="IDX_sync_utcSyncDate">
+    <index id="132" parent="18" name="IDX_sync_utcSyncDate">
      <ColNames>utcSyncDate</ColNames>
    </index>
-    <key id="146" parent="19">
+    <key id="133" parent="18">
      <ColNames>id</ColNames>
      <Primary>1</Primary>
    </key>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <file url="PROJECT" libraries="{@types/jquery}" />
+  </component>
+</project>
@@ -1,11 +1,9 @@
-FROM node:12.6.0-alpine
+FROM node:12.13.0-alpine

 # Create app directory
 WORKDIR /usr/src/app

-# Copy both package.json and package-lock.json
-# where available (npm@5+)
-COPY package.json package-lock.json ./
+COPY server-package.json package.json

 # Install app dependencies
 RUN set -x \
@@ -46,5 +46,12 @@ Use a browser based dev environment
 Or clone locally and run
 ```
 npm install
-npm run start
-```
+npm run start-server
+```
+
+## Shoutouts
+
+* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - best WYSIWYG editor on the market, very interactive and listening team
+* [FancyTree](https://github.com/mar10/fancytree) - very feature rich tree library without real competition. Trilium Notes would not be the same without it.
+* [CodeMirror](https://github.com/codemirror/CodeMirror) - code editor with support for huge amount of languages
+* [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map)
@@ -3,6 +3,8 @@
 VERSION=`jq -r ".version" package.json`
 SERIES=${VERSION:0:4}-latest

+cat package.json | grep -v electron > server-package.json
+
 sudo docker build -t zadam/trilium:$VERSION -t zadam/trilium:$SERIES .

 if [[ $VERSION != *"beta"* ]]; then
@@ -1,17 +1,27 @@
 #!/usr/bin/env bash

+SRC_DIR=./dist/trilium-linux-x64-src
+
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $SRC_DIR
+fi
+
+echo "Copying required linux-x64 binaries"
+
+rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
+rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
+rm -r $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/*
+
+cp -r bin/deps/linux-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
+cp bin/deps/linux-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
+cp bin/deps/linux-x64/spellchecker/* $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/
+
+./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
+
 BUILD_DIR=./dist/trilium-linux-x64
 rm -rf $BUILD_DIR

-rm -r node_modules/sqlite3/lib/binding/*
-
-cp -r bin/deps/linux-x64/sqlite/* node_modules/sqlite3/lib/binding/
-
-# rebuild binaries for image operations (pngquant ...)
-npm rebuild
-
-./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
-
 mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR

 cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png
@@ -25,3 +35,7 @@ VERSION=`jq -r ".version" package.json`
 cd dist

 tar cJf trilium-linux-x64-${VERSION}.tar.xz trilium-linux-x64
+
+cd ..
+
+bin/build-debian.sh
@@ -1,27 +1,36 @@
 #!/usr/bin/env bash

+SRC_DIR=./dist/trilium-mac-x64-src
+
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $SRC_DIR
+fi
+
+echo "Copying required mac binaries"
+
+rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
+rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
+rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
+rm -r $SRC_DIR/node_modules/giflossy/vendor/*
+rm -r $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/*
+rm -r $SRC_DIR/node_modules/keyboard-layout/build/Release/*
+
+cp -r bin/deps/mac-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
+cp bin/deps/mac-x64/image/cjpeg $SRC_DIR/node_modules/mozjpeg/vendor/
+cp bin/deps/mac-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
+cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/vendor/
+cp bin/deps/mac-x64/spellchecker/* $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/
+cp bin/deps/mac-x64/keyboard-layout-manager.node $SRC_DIR/node_modules/keyboard-layout/build/Release/
+
+./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
+
 BUILD_DIR=./dist/trilium-mac-x64
 rm -rf $BUILD_DIR

-echo "Copying required mac binaries"
-
-rm -r node_modules/sqlite3/lib/binding/*
-rm -r node_modules/mozjpeg/vendor/*
-rm -r node_modules/pngquant-bin/vendor/*
-rm -r node_modules/giflossy/vendor/*
-
-cp -r bin/deps/mac-x64/sqlite/* node_modules/sqlite3/lib/binding/
-cp bin/deps/mac-x64/image/cjpeg node_modules/mozjpeg/vendor/
-cp bin/deps/mac-x64/image/pngquant node_modules/pngquant-bin/vendor/
-cp bin/deps/mac-x64/image/gifsicle node_modules/giflossy/vendor/
-
-./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
-
 # Mac build has by default useless directory level
 mv "./dist/Trilium Notes-darwin-x64" $BUILD_DIR

-./bin/reset-local.sh
-
 echo "Zipping mac x64 electron distribution..."

 VERSION=`jq -r ".version" package.json`
@@ -1,40 +1,32 @@
 #!/usr/bin/env bash

 PKG_DIR=dist/trilium-linux-x64-server
-NODE_VERSION=12.6.0
+NODE_VERSION=12.13.0

-rm -r $PKG_DIR
-mkdir $PKG_DIR
-cd $PKG_DIR
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $PKG_DIR
+fi

+cd dist
 wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz
 tar xvfJ node-v${NODE_VERSION}-linux-x64.tar.xz
 rm node-v${NODE_VERSION}-linux-x64.tar.xz
-
-mv node-v${NODE_VERSION}-linux-x64 node
-
-cp -r ../../node_modules/ ./
-cp -r ../../images/ ./
-cp -r ../../libraries/ ./
-cp -r ../../src/ ./
-cp -r ../../db/ ./
-cp -r ../../package.json ./
-cp -r ../../package-lock.json ./
-cp -r ../../README.md ./
-cp -r ../../LICENSE ./
-cp -r ../../config-sample.ini ./
-
-rm -r ./node_modules/electron*
-
-rm -r ./node_modules/sqlite3/lib/binding/*
-
-cp -r ../../bin/deps/linux-x64/sqlite/node* ./node_modules/sqlite3/lib/binding/
-
-printf "#!/bin/sh\n./node/bin/node src/www" > trilium.sh
-chmod 755 trilium.sh
-
 cd ..

-VERSION=`jq -r ".version" ../package.json`
+mv dist/node-v${NODE_VERSION}-linux-x64 $PKG_DIR/node
+
+rm -r $PKG_DIR/node_modules/electron*
+
+rm -r $PKG_DIR/node_modules/sqlite3/lib/binding/*
+
+cp -r ./bin/deps/linux-x64/sqlite/node* $PKG_DIR/node_modules/sqlite3/lib/binding/
+
+printf "#!/bin/sh\n./node/bin/node src/www" > $PKG_DIR/trilium.sh
+chmod 755 $PKG_DIR/trilium.sh
+
+VERSION=`jq -r ".version" package.json`
+
+cd dist

 tar cJf trilium-linux-x64-server-${VERSION}.tar.xz trilium-linux-x64-server
@@ -1,29 +1,39 @@
 #!/usr/bin/env bash

-BUILD_DIR=./dist/trilium-windows-x64
-rm -rf $BUILD_DIR
+SRC_DIR=./dist/trilium-windows-x64-src
+
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $SRC_DIR
+fi

 echo "Copying required windows binaries"

-rm -r node_modules/sqlite3/lib/binding/*
-rm -r node_modules/mozjpeg/vendor/*
-rm -r node_modules/pngquant-bin/vendor/*
-rm -r node_modules/giflossy/vendor/*
+rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
+rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
+rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
+rm -r $SRC_DIR/node_modules/giflossy/vendor/*
+rm -r $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/*
+rm -r $SRC_DIR/node_modules/keyboard-layout/build/Release/*
+rm -r $SRC_DIR/node_modules/cld/build/Release/*

-cp -r bin/deps/win-x64/sqlite/* node_modules/sqlite3/lib/binding/
-cp bin/deps/win-x64/image/cjpeg.exe node_modules/mozjpeg/vendor/
-cp bin/deps/win-x64/image/pngquant.exe node_modules/pngquant-bin/vendor/
-cp bin/deps/win-x64/image/gifsicle.exe node_modules/giflossy/vendor/
+cp -r bin/deps/win-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
+cp bin/deps/win-x64/image/cjpeg.exe $SRC_DIR/node_modules/mozjpeg/vendor/
+cp bin/deps/win-x64/image/pngquant.exe $SRC_DIR/node_modules/pngquant-bin/vendor/
+cp bin/deps/win-x64/image/gifsicle.exe $SRC_DIR/node_modules/giflossy/vendor/
+cp bin/deps/win-x64/spellchecker/* $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/
+cp bin/deps/win-x64/keyboard-layout-manager.node $SRC_DIR/node_modules/keyboard-layout/build/Release/

-./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico
+./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico
+
+BUILD_DIR=./dist/trilium-windows-x64
+rm -rf $BUILD_DIR

 mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR

 # removing software WebGL binaries because they are pretty huge and not necessary
 rm -r $BUILD_DIR/swiftshader

-./bin/reset-local.sh
-
 echo "Zipping windows x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`

@@ -1,21 +1,23 @@
 #!/usr/bin/env bash

-rm -r node_modules
-
-npm install
-
 echo "Deleting existing builds"

-rm -r dist/*
+rm -rf dist/*

-bin/build-win-x64.sh
+SRC_DIR=dist/trilium-src

-bin/build-mac-x64.sh
+bin/copy-trilium.sh $SRC_DIR

-# building X64 linux as the last so electron-rebuild will prepare X64 binaries for local development
-bin/build-linux-x64.sh
+# we'll just copy the same SRC dir to all the builds so we don't have to do npm install in each separately
+cp -r $SRC_DIR ./dist/trilium-linux-x64-src
+cp -r $SRC_DIR ./dist/trilium-linux-x64-server
+cp -r $SRC_DIR ./dist/trilium-windows-x64-src
+cp -r $SRC_DIR ./dist/trilium-mac-x64-src

-# this needs to be run after linux build
-bin/build-debian.sh
+bin/build-win-x64.sh DONTCOPY

-bin/build-server.sh
+bin/build-mac-x64.sh DONTCOPY
+
+bin/build-linux-x64.sh DONTCOPY
+
+bin/build-server.sh DONTCOPY
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+if [[ $# -eq 0 ]] ; then
+    echo "Missing argument of target directory"
+    exit 1
+fi
+
+DIR=$1
+
+rm -rf $DIR
+mkdir $DIR
+
+echo "Copying Trilium to build directory $DIR"
+
+cp -r images $DIR/
+cp -r libraries $DIR/
+cp -r src $DIR/
+cp -r db $DIR/
+cp -r package.json $DIR/
+cp -r package-lock.json $DIR/
+cp -r README.md $DIR/
+cp -r LICENSE $DIR/
+cp -r config-sample.ini $DIR/
+cp -r electron.js $DIR/
+
+# run in subshell (so we return to original dir)
+(cd $DIR && npm install --only=prod)
+
+rm -r $DIR/node_modules/cld/deps
+
+find $DIR/libraries -name "*.map" -type f -delete
+find $DIR/libraries -name "hunspell.lib" -type f -delete
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-./node_modules/.bin/electron-rebuild --arch=x64
@@ -0,0 +1,10 @@
+UPDATE links SET type = 'internal-link' WHERE type = 'hyper';
+UPDATE links SET type = 'image-link' WHERE type = 'image';
+UPDATE links SET type = 'relation-map-link' WHERE type = 'relation-map';
+
+INSERT INTO attributes (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable)
+SELECT linkId, noteId, 'relation', type, targetNoteId, 0, utcDateCreated, utcDateModified, isDeleted, hash, 0 FROM links;
+
+UPDATE sync SET entityName = 'attributes' WHERE entityName = 'links';
+
+DROP TABLE links;
@@ -0,0 +1,5 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('sidebarMinWidth', '350', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('sidebarWidthPercent', '25', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('showSidebarInNewTab', 'true', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
@@ -0,0 +1,14 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('noteInfoWidget', '{"enabled":true,"expanded":true,"position":100}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('attributesWidget', '{"enabled":true,"expanded":true,"position":200}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('linkMapWidget', '{"enabled":true,"expanded":true,"position":300}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('noteRevisionsWidget', '{"enabled":true,"expanded":true,"position":400}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('whatLinksHereWidget', '{"enabled":false,"expanded":true,"position":500}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
@@ -0,0 +1,5 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('codeNotesMimeTypes', '["text/x-csrc","text/x-c++src","text/x-csharp","text/css","text/x-go","text/x-groovy","text/x-haskell","text/html","message/http","text/x-java","application/javascript;env=frontend","application/javascript;env=backend","application/json","text/x-kotlin","text/x-markdown","text/x-perl","text/x-php","text/x-python","text/x-ruby",null,"text/x-sql","text/x-swift","text/xml","text/x-yaml"]', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 1);
+
+INSERT INTO sync (entityName, entityId, sourceId, utcSyncDate)
+VALUES ('options' ,'codeNotesMimeTypes', 'SYNC_FILL', '2018-01-01T00:00:00.000Z');
@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('similarNotesWidget', '{"enabled":true,"expanded":true,"position":600}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
@@ -0,0 +1 @@
+DROP TABLE event_log;
@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('editedNotesWidget', '{"enabled":true,"expanded":true,"position":50}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('calendarWidget', '{"enabled":true,"expanded":true,"position":20}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
@@ -0,0 +1,5 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('spellCheckEnabled', 'true', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('spellCheckLanguageCode', 'en-US', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
@@ -0,0 +1,3 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+SELECT 'hideTabRowForOneTab', 'false', '2019-05-01T18:31:00.874Z', '2019-05-01T18:31:00.874Z', 0
+WHERE NOT EXISTS(SELECT 1 FROM options WHERE name = 'hideTabRowForOneTab');
@@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS "mig_branches" (
+                                          `branchId`	TEXT NOT NULL,
+                                          `noteId`	TEXT NOT NULL,
+                                          `parentNoteId`	TEXT NOT NULL,
+                                          `notePosition`	INTEGER NOT NULL,
+                                          `prefix`	TEXT,
+                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
+                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+                                          `utcDateModified`	TEXT NOT NULL,
+                                          utcDateCreated TEXT NOT NULL,
+                                          hash TEXT DEFAULT "" NOT NULL,
+                                          PRIMARY KEY(`branchId`));
+
+INSERT INTO mig_branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash)
+SELECT branchId, noteId, parentNoteId, notePosition, prefix, COALESCE(isExpanded, 0), isDeleted, utcDateModified, utcDateCreated, hash FROM branches;
+
+DROP TABLE branches;
+ALTER TABLE mig_branches RENAME TO branches;
+
+CREATE INDEX `IDX_branches_noteId` ON `branches` (`noteId`);
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
@@ -0,0 +1,2 @@
+UPDATE branches SET notePosition = notePosition * 10;
+UPDATE attributes SET position = position * 10;
@@ -29,25 +29,6 @@ CREATE TABLE IF NOT EXISTS "api_tokens"
  utcDateCreated TEXT NOT NULL,
  isDeleted INT NOT NULL DEFAULT 0,
  hash TEXT DEFAULT "" NOT NULL);
-CREATE TABLE IF NOT EXISTS "branches" (
-                                        `branchId`	TEXT NOT NULL,
-                                        `noteId`	TEXT NOT NULL,
-                                        `parentNoteId`	TEXT NOT NULL,
-                                        `notePosition`	INTEGER NOT NULL,
-                                        `prefix`	TEXT,
-                                        `isExpanded`	BOOLEAN,
-                                        `isDeleted`	INTEGER NOT NULL DEFAULT 0,
-                                        `utcDateModified`	TEXT NOT NULL,
-                                        utcDateCreated TEXT NOT NULL,
-                                        hash TEXT DEFAULT "" NOT NULL,
-                                        PRIMARY KEY(`branchId`)
-);
-CREATE TABLE IF NOT EXISTS "event_log" (
-                                         `eventId`	TEXT NOT NULL PRIMARY KEY,
-                                         `noteId`	TEXT,
-                                         `comment`	TEXT,
-                                         `utcDateCreated`	TEXT NOT NULL
-);
 CREATE TABLE IF NOT EXISTS "options"
 (
  name TEXT not null PRIMARY KEY,
@@ -70,17 +51,6 @@ CREATE TABLE IF NOT EXISTS "attributes"
  isDeleted    INT  not null,
  hash         TEXT default "" not null,
  isInheritable int DEFAULT 0 NULL);
-CREATE TABLE IF NOT EXISTS "links" (
-                                     `linkId`	TEXT NOT NULL,
-                                     `noteId`	TEXT NOT NULL,
-                                     `targetNoteId`	TEXT NOT NULL,
-                                     `type` TEXT NOT NULL,
-                                     `hash` TEXT DEFAULT "" NOT NULL,
-                                     `isDeleted`	INTEGER NOT NULL DEFAULT 0,
-                                     `utcDateCreated`	TEXT NOT NULL,
-                                     `utcDateModified`	TEXT NOT NULL,
-                                     PRIMARY KEY(`linkId`)
-);
 CREATE TABLE IF NOT EXISTS "notes" (
                                     `noteId`	TEXT NOT NULL,
                                     `title`	TEXT NOT NULL DEFAULT "note",
@@ -111,20 +81,8 @@ CREATE INDEX `IDX_note_revisions_dateModifiedFrom` ON `note_revisions` (
 CREATE INDEX `IDX_note_revisions_dateModifiedTo` ON `note_revisions` (
                                                                      `utcDateModifiedTo`
  );
-CREATE INDEX `IDX_branches_noteId` ON `branches` (
-                                                  `noteId`
-  );
-CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (
-                                                               `noteId`,
-                                                               `parentNoteId`
-  );
-CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
 CREATE INDEX IDX_attributes_name_value
  on attributes (name, value);
-CREATE INDEX IDX_links_noteId_index
-  on links (noteId);
-CREATE INDEX IDX_links_targetNoteId_index
-  on links (targetNoteId);
 CREATE INDEX IDX_attributes_name_index
  on attributes (name);
 CREATE INDEX IDX_attributes_noteId_index
@@ -146,3 +104,18 @@ CREATE TABLE recent_notes
    utcDateCreated TEXT not null,
    isDeleted INT
 );
+CREATE TABLE IF NOT EXISTS "branches" (
+                                          `branchId`	TEXT NOT NULL,
+                                          `noteId`	TEXT NOT NULL,
+                                          `parentNoteId`	TEXT NOT NULL,
+                                          `notePosition`	INTEGER NOT NULL,
+                                          `prefix`	TEXT,
+                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
+                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+                                          `utcDateModified`	TEXT NOT NULL,
+                                          utcDateCreated TEXT NOT NULL,
+                                          hash TEXT DEFAULT "" NOT NULL,
+                                          PRIMARY KEY(`branchId`));
+CREATE INDEX `IDX_branches_noteId` ON `branches` (`noteId`);
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
@@ -239,6 +239,8 @@



+
+
    
    </div>

@@ -282,13 +284,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -349,7 +349,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line24">line 24</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line29">line 29</a>
    </li></ul></dd>
    

@@ -377,6 +377,8 @@



+
+
    
    </div>

@@ -485,6 +487,8 @@



+
+
 <h5>Returns:</h5>

        
@@ -585,6 +589,8 @@



+
+
 <h5>Returns:</h5>

        
@@ -685,6 +691,8 @@



+
+
 <h5>Returns:</h5>

        
@@ -724,13 +732,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -109,6 +109,8 @@



+
+
    
    </div>

@@ -394,7 +396,7 @@ the backend.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line310">line 310</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line312">line 312</a>
    </li></ul></dd>
    

@@ -781,6 +783,8 @@ the backend.



+
+
 <h5>Returns:</h5>

        
@@ -1067,6 +1071,8 @@ the backend.



+
+
 <h5>Returns:</h5>

        
@@ -1247,6 +1253,8 @@ the backend.



+
+
 <h5>Returns:</h5>

        
@@ -1446,6 +1454,8 @@ the backend.



+
+
 <h5>Returns:</h5>

        
@@ -1523,7 +1533,7 @@ the backend.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line315">line 315</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line317">line 317</a>
    </li></ul></dd>
    

@@ -1546,6 +1556,8 @@ the backend.



+
+
 <h5>Returns:</h5>

        
@@ -1702,6 +1714,8 @@ the backend.



+
+
 <h5>Returns:</h5>

        
@@ -1851,6 +1865,8 @@ the backend.



+
+
 <h5>Returns:</h5>

        
@@ -1981,7 +1997,7 @@ the backend.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line239">line 239</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line241">line 241</a>
    </li></ul></dd>
    

@@ -2004,6 +2020,8 @@ the backend.



+
+
 <h5>Returns:</h5>

        
@@ -2176,6 +2194,8 @@ the backend.



+
+
 <h5>Returns:</h5>

        
@@ -2352,6 +2372,8 @@ the backend.



+
+
 <h5>Returns:</h5>

        
@@ -2501,6 +2523,8 @@ the backend.



+
+
 <h5>Returns:</h5>

        
@@ -2606,6 +2630,8 @@ if some action needs to happen on only one specific instance.



+
+
 <h5>Returns:</h5>

        
@@ -2739,7 +2765,7 @@ if some action needs to happen on only one specific instance.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line258">line 258</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line260">line 260</a>
    </li></ul></dd>
    

@@ -2762,6 +2788,8 @@ if some action needs to happen on only one specific instance.



+
+
 <h5>Returns:</h5>

        
@@ -2911,6 +2939,8 @@ if some action needs to happen on only one specific instance.



+
+
 <h5>Returns:</h5>

        
@@ -3107,6 +3137,8 @@ if some action needs to happen on only one specific instance.



+
+
 <h5>Returns:</h5>

        
@@ -3303,6 +3335,8 @@ if some action needs to happen on only one specific instance.



+
+
 <h5>Returns:</h5>

        
@@ -3384,7 +3418,7 @@ if some action needs to happen on only one specific instance.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line230">line 230</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line232">line 232</a>
    </li></ul></dd>
    

@@ -3407,6 +3441,8 @@ if some action needs to happen on only one specific instance.



+
+
 <h5>Returns:</h5>

        
@@ -3560,7 +3596,7 @@ if some action needs to happen on only one specific instance.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line249">line 249</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line251">line 251</a>
    </li></ul></dd>
    

@@ -3583,6 +3619,8 @@ if some action needs to happen on only one specific instance.



+
+
 <h5>Returns:</h5>

        
@@ -3713,7 +3751,7 @@ if some action needs to happen on only one specific instance.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line267">line 267</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line269">line 269</a>
    </li></ul></dd>
    

@@ -3736,6 +3774,8 @@ if some action needs to happen on only one specific instance.



+
+
 <h5>Returns:</h5>

        
@@ -3861,7 +3901,7 @@ if some action needs to happen on only one specific instance.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line222">line 222</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line224">line 224</a>
    </li></ul></dd>
    

@@ -3889,6 +3929,8 @@ if some action needs to happen on only one specific instance.



+
+
        
            

@@ -4020,6 +4062,8 @@ if some action needs to happen on only one specific instance.



+
+
 <h5>Returns:</h5>

        
@@ -4174,6 +4218,8 @@ if some action needs to happen on only one specific instance.



+
+
 <h5>Returns:</h5>

        
@@ -4381,7 +4427,7 @@ This method looks similar to toggleNoteInParent() but differs because we're look
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line287">line 287</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line289">line 289</a>
    </li></ul></dd>
    

@@ -4409,6 +4455,8 @@ This method looks similar to toggleNoteInParent() but differs because we're look



+
+
        
            

@@ -4512,7 +4560,7 @@ This method looks similar to toggleNoteInParent() but differs because we're look
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line274">line 274</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line276">line 276</a>
    </li></ul></dd>
    

@@ -4535,6 +4583,8 @@ This method looks similar to toggleNoteInParent() but differs because we're look



+
+
 <h5>Returns:</h5>

        
@@ -4749,6 +4799,8 @@ This method looks similar to toggleNoteInParent() but differs because we're look



+
+
 <h5>Returns:</h5>

        
@@ -4883,7 +4935,7 @@ transactional by default.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line300">line 300</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line302">line 302</a>
    </li></ul></dd>
    

@@ -4906,6 +4958,8 @@ transactional by default.



+
+
 <h5>Returns:</h5>

        
@@ -4949,13 +5003,13 @@ transactional by default.
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -327,7 +327,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line24">line 24</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line30">line 30</a>
    </li></ul></dd>
    

@@ -355,6 +355,8 @@ Each note can have multiple (at least one) branches, meaning it can be placed in



+
+
    
    </div>

@@ -463,6 +465,8 @@ Each note can have multiple (at least one) branches, meaning it can be placed in



+
+
 <h5>Returns:</h5>

        
@@ -505,13 +509,13 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -178,6 +178,8 @@



+
+
    
    </div>

@@ -210,13 +212,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -372,7 +372,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line24">line 24</a>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line29">line 29</a>
    </li></ul></dd>
    

@@ -400,6 +400,8 @@



+
+
    
    </div>

@@ -443,13 +445,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -234,7 +234,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_option.js.html">entities/option.js</a>, <a href="entities_option.js.html#line17">line 17</a>
+        <a href="entities_option.js.html">entities/option.js</a>, <a href="entities_option.js.html#line22">line 22</a>
    </li></ul></dd>
    

@@ -262,6 +262,8 @@



+
+
    
    </div>

@@ -305,13 +307,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -239,6 +239,8 @@



+
+
    
    </div>

@@ -282,13 +284,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -69,13 +69,13 @@ module.exports = ApiToken;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -150,13 +150,13 @@ module.exports = Attribute;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -70,7 +70,7 @@ class Branch extends Entity {
    async beforeSaving() {
        if (this.notePosition === undefined) {
            const maxNotePos = await sql.getValue('SELECT MAX(notePosition) FROM branches WHERE parentNoteId = ? AND isDeleted = 0', [this.parentNoteId]);
-            this.notePosition = maxNotePos === null ? 0 : maxNotePos + 1;
+            this.notePosition = maxNotePos === null ? 0 : maxNotePos + 10;
        }

        if (!this.isDeleted) {
@@ -104,13 +104,13 @@ module.exports = Branch;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -96,13 +96,13 @@ module.exports = Entity;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -223,9 +223,35 @@ class Note extends Entity {

    /**
     * @returns {Promise&lt;Attribute[]>} attributes belonging to this specific note (excludes inherited attributes)
+     *
+     * This method can be significantly faster than the getAttributes()
     */
-    async getOwnedAttributes() {
-        return await repository.getEntities(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ?`, [this.noteId]);
+    async getOwnedAttributes(type, name) {
+        let query = `SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ?`;
+        const params = [this.noteId];
+
+        if (type) {
+            query += ` AND type = ?`;
+            params.push(type);
+        }
+
+        if (name) {
+            query += ` AND name = ?`;
+            params.push(name);
+        }
+
+        return await repository.getEntities(query, params);
+    }
+
+    /**
+     * @returns {Promise&lt;Attribute>} attribute belonging to this specific note (excludes inherited attributes)
+     *
+     * This method can be significantly faster than the getAttribute()
+     */
+    async getOwnedAttribute(type, name) {
+        const attrs = await this.getOwnedAttributes(type, name);
+
+        return attrs.length > 0 ? attrs[0] : null;
    }

    /**
@@ -276,6 +302,21 @@ class Note extends Entity {
        return (await this.getAttributes(name)).filter(attr => attr.type === RELATION);
    }

+    /**
+     * @param {string} [name] - relation name to filter
+     * @returns {Promise&lt;Note[]>}
+     */
+    async getRelationTargets(name) {
+        const relations = await this.getRelations(name);
+        const targets = [];
+
+        for (const relation of relations) {
+            targets.push(await relation.getTargetNote());
+        }
+
+        return targets;
+    }
+
    /**
     * @param {string} [name] - relation name to filter
     * @returns {Promise&lt;Attribute[]>} all note's relation definitions including inherited ones
@@ -308,16 +349,16 @@ class Note extends Entity {
            treeWithAttrs(noteId, level) AS (
                SELECT * FROM tree
                UNION
-                SELECT attributes.value, treeWithAttrs.level + 1 FROM attributes
+                SELECT attributes.value, treeWithAttrs.level FROM attributes
                     JOIN treeWithAttrs ON treeWithAttrs.noteId = attributes.noteId
                WHERE attributes.isDeleted = 0
                  AND attributes.type = 'relation'
                  AND attributes.name = 'template'
-                  AND (attributes.noteId = ? OR attributes.isInheritable = 1)
+                  AND (treeWithAttrs.level = 0 OR attributes.isInheritable = 1)
                )
            SELECT attributes.* FROM attributes JOIN treeWithAttrs ON attributes.noteId = treeWithAttrs.noteId
-            WHERE attributes.isDeleted = 0 AND (attributes.isInheritable = 1 OR attributes.noteId = ?)
-            ORDER BY level, noteId, position`, [this.noteId, this.noteId, this.noteId]);
+            WHERE attributes.isDeleted = 0 AND (attributes.isInheritable = 1 OR treeWithAttrs.level = 0)
+            ORDER BY level, noteId, position`, [this.noteId]);
        // attributes are ordered so that "closest" attributes are first
        // we order by noteId so that attributes from same note stay together. Actual noteId ordering doesn't matter.

@@ -641,28 +682,17 @@ class Note extends Entity {
    /**
     * Get list of links coming out of this note.
     *
-     * @returns {Promise&lt;Link[]>}
+     * @deprecated - not intended for general use
+     * @returns {Promise&lt;Attribute[]>}
     */
    async getLinks() {
-        return await repository.getEntities("SELECT * FROM links WHERE noteId = ? AND isDeleted = 0", [this.noteId]);
-    }
-
-    /**
-     * Get list of links targetting this note.
-     *
-     * @returns {Promise&lt;Link[]>}
-     */
-    async getTargetLinks() {
-        return await repository.getEntities("SELECT * FROM links WHERE targetNoteId = ? AND isDeleted = 0", [this.noteId]);
-    }
-
-    /**
-     * Return all links from this note, including deleted ones.
-     *
-     * @returns {Promise&lt;Link[]>}
-     */
-    async getLinksWithDeleted() {
-        return await repository.getEntities("SELECT * FROM links WHERE noteId = ?", [this.noteId]);
+        return await repository.getEntities(`
+            SELECT * 
+            FROM attributes 
+            WHERE noteId = ? AND 
+                  isDeleted = 0 AND 
+                  type = 'relation' AND 
+                  name IN ('internal-link', 'image-link', 'relation-map-link')`, [this.noteId]);
    }

    /**
@@ -769,13 +799,13 @@ module.exports = Note;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -87,13 +87,13 @@ module.exports = NoteRevision;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -76,13 +76,13 @@ module.exports = Option;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -69,13 +69,13 @@ module.exports = RecentNote;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -588,13 +588,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -50,13 +50,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -1,12 +1,12 @@
 /*global document */
-(function() {
-    var source = document.getElementsByClassName('prettyprint source linenums');
-    var i = 0;
-    var lineNumber = 0;
-    var lineId;
-    var lines;
-    var totalLines;
-    var anchorHash;
+(() => {
+    const source = document.getElementsByClassName('prettyprint source linenums');
+    let i = 0;
+    let lineNumber = 0;
+    let lineId;
+    let lines;
+    let totalLines;
+    let anchorHash;

    if (source && source[0]) {
        anchorHash = document.location.hash.substring(1);
@@ -15,7 +15,7 @@

        for (; i < totalLines; i++) {
            lineNumber++;
-            lineId = 'line' + lineNumber;
+            lineId = `line${lineNumber}`;
            lines[i].id = lineId;
            if (lineId === anchorHash) {
                lines[i].className += ' selected';
@@ -38,7 +38,7 @@ const repository = require('./repository');
 const axios = require('axios');
 const dayjs = require('dayjs');
 const cloningService = require('./cloning');
-const messagingService = require('./messaging');
+const ws = require('./ws.js');
 const appInfo = require('./app_info');
 const searchService = require('./search');

@@ -237,9 +237,11 @@ function BackendScriptApi(currentNote, apiParams) {
     * @returns {Promise&lt;{note: Note, branch: Branch}>} object contains newly created entities note and branch
     */
    this.createNoteAndRefresh = async function(parentNoteId, title, content, extraOptions) {
-        await noteService.createNote(parentNoteId, title, content, extraOptions);
+        const ret = await noteService.createNote(parentNoteId, title, content, extraOptions);

-        messagingService.refreshTree();
+        ws.refreshTree();
+        
+        return ret;
    };

    /**
@@ -335,7 +337,7 @@ function BackendScriptApi(currentNote, apiParams) {
     *
     * @returns {Promise&lt;void>}
     */
-    this.refreshTree = messagingService.refreshTree;
+    this.refreshTree = ws.refreshTree;

    /**
     * @return {{syncVersion, appVersion, buildRevision, dbVersion, dataDirectory, buildDate}|*} - object representing basic info about running Trilium version
@@ -343,7 +345,8 @@ function BackendScriptApi(currentNote, apiParams) {
    this.getAppInfo = () => appInfo
 }

-module.exports = BackendScriptApi;</code></pre>
+module.exports = BackendScriptApi;
+</code></pre>
        </article>
    </section>

@@ -353,13 +356,13 @@ module.exports = BackendScriptApi;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -273,7 +273,7 @@ tr > th:last-child { border-right: 1px solid #ddd; }
    margin: 0;
 }

-.prettyprint
+.source
 {
    border: 1px solid #ddd;
    width: 80%;
@@ -284,7 +284,7 @@ tr > th:last-child { border-right: 1px solid #ddd; }
    width: inherit;
 }

-.prettyprint code
+.source code
 {
    font-size: 100%;
    line-height: 18px;
@@ -93,7 +93,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line2">line 2</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line3">line 3</a>
    </li></ul></dd>
    

@@ -121,6 +121,8 @@



+
+
    
    </div>

@@ -570,6 +572,8 @@



+
+
 <h5>Returns:</h5>

        
@@ -670,6 +674,8 @@



+
+
 <h5>Returns:</h5>

        
@@ -719,7 +725,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -93,7 +93,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_full.js.html">entities/note_full.js</a>, <a href="entities_note_full.js.html#line6">line 6</a>
+        <a href="entities_note_full.js.html">entities/note_full.js</a>, <a href="entities_note_full.js.html#line7">line 7</a>
    </li></ul></dd>
    

@@ -121,6 +121,8 @@



+
+
    
    </div>

@@ -453,7 +455,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -77,7 +77,7 @@ export default Attribute;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -76,7 +76,7 @@ export default Branch;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -32,8 +32,8 @@
 * Represents full note, specifically including note's content.
 */
 class NoteFull extends NoteShort {
-    constructor(treeCache, row) {
-        super(treeCache, row);
+    constructor(treeCache, row, noteShort) {
+        super(treeCache, row, []);

        /** @param {string} */
        this.content = row.content;
@@ -49,6 +49,12 @@ class NoteFull extends NoteShort {

        /** @param {string} */
        this.utcDateModified = row.utcDateModified;
+
+        /* ugly */
+        this.parents = noteShort.parents;
+        this.parentToBranch = noteShort.parentToBranch;
+        this.children = noteShort.children;
+        this.childToBranch = noteShort.childToBranch;
    }
 }

@@ -68,7 +74,7 @@ export default NoteFull;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -27,6 +27,8 @@
    <section>
        <article>
            <pre class="prettyprint source linenums"><code>import server from '../services/server.js';
+import Attribute from './attribute.js';
+import branches from "../services/branches.js";

 const LABEL = 'label';
 const LABEL_DEFINITION = 'label-definition';
@@ -34,11 +36,18 @@ const RELATION = 'relation';
 const RELATION_DEFINITION = 'relation-definition';

 /**
+ * FIXME: rethink how attributes are cached in Note entities since they are long lived inside the cache.
+ * Attribute cache should be limited to "transaction".
+ *
 * This note's representation is used in note tree and is kept in TreeCache.
- * Its notable omission is the note content.
 */
 class NoteShort {
-    constructor(treeCache, row) {
+    /**
+     * @param {TreeCache} treeCache
+     * @param {Object.&lt;string, Object>} row
+     * @param {Branch[]} branches - all relevant branches, i.e. where this note is either child or parent
+     */
+    constructor(treeCache, row, branches) {
        this.treeCache = treeCache;
        /** @param {string} */
        this.noteId = row.noteId;
@@ -52,7 +61,57 @@ class NoteShort {
        this.mime = row.mime;
        /** @param {boolean} */
        this.archived = row.archived;
+        /** @param {string} */
        this.cssClass = row.cssClass;
+
+        /** @type {string[]} */
+        this.parents = [];
+        /** @type {string[]} */
+        this.children = [];
+
+        /** @type {Object.&lt;string, string>} */
+        this.parentToBranch = {};
+
+        /** @type {Object.&lt;string, string>} */
+        this.childToBranch = {};
+
+        for (const branch of branches) {
+            if (this.noteId === branch.noteId) {
+                this.parents.push(branch.parentNoteId);
+                this.parentToBranch[branch.parentNoteId] = branch.branchId;
+            }
+            else if (this.noteId === branch.parentNoteId) {
+                this.children.push(branch.noteId);
+                this.childToBranch[branch.noteId] = branch.branchId;
+            }
+            else {
+                throw new Error(`Unknown branch ${branch.branchId} for note ${this.noteId}`);
+            }
+        }
+    }
+
+    addParent(parentNoteId, branchId) {
+        if (!this.parents.includes(parentNoteId)) {
+            this.parents.push(parentNoteId);
+        }
+
+        this.parentToBranch[parentNoteId] = branchId;
+    }
+
+    addChild(childNoteId, branchId) {
+        if (!this.children.includes(childNoteId)) {
+            this.children.push(childNoteId);
+        }
+
+        this.childToBranch[childNoteId] = branchId;
+
+        const branchIdPos = {};
+
+        for (const branchId of Object.values(this.childToBranch)) {
+            branchIdPos[branchId] = this.treeCache.branches[branchId].notePosition;
+        }
+
+        this.children.sort((a, b) => branchIdPos[this.childToBranch[a]] &lt; branchIdPos[this.childToBranch[b]] ? -1 : 1);
    }

    /** @returns {boolean} */
@@ -60,50 +119,63 @@ class NoteShort {
        return this.mime === "application/json";
    }

+    async getContent() {
+        // we're not caching content since these objects are in treeCache and as such pretty long lived
+        const note = await server.get("notes/" + this.noteId);
+
+        return note.content;
+    }
+
+    async getJsonContent() {
+        const content = await this.getContent();
+
+        try {
+            return JSON.parse(content);
+        }
+        catch (e) {
+            console.log(`Cannot parse content of note ${this.noteId}: `, e.message);
+
+            return null;
+        }
+    }
+
    /** @returns {Promise&lt;Branch[]>} */
    async getBranches() {
-        const branchIds = this.treeCache.parents[this.noteId].map(
-            parentNoteId => this.treeCache.getBranchIdByChildParent(this.noteId, parentNoteId));
+        const branchIds = Object.values(this.parentToBranch);

        return this.treeCache.getBranches(branchIds);
    }

    /** @returns {boolean} */
    hasChildren() {
-        return this.treeCache.children[this.noteId]
-            &amp;&amp; this.treeCache.children[this.noteId].length > 0;
+        return this.children.length > 0;
    }

    /** @returns {Promise&lt;Branch[]>} */
    async getChildBranches() {
-        if (!this.treeCache.children[this.noteId]) {
-            return [];
-        }
+        const branchIds = Object.values(this.childToBranch);

-        const branchIds = this.treeCache.children[this.noteId].map(
-            childNoteId => this.treeCache.getBranchIdByChildParent(childNoteId, this.noteId));
-
-        return await this.treeCache.getBranches(branchIds);
+        return this.treeCache.getBranches(branchIds);
    }

    /** @returns {string[]} */
    getParentNoteIds() {
-        return this.treeCache.parents[this.noteId] || [];
+        return this.parents;
    }

    /** @returns {Promise&lt;NoteShort[]>} */
    async getParentNotes() {
-        return await this.treeCache.getNotes(this.getParentNoteIds());
+        return await this.treeCache.getNotes(this.parents);
    }

    /** @returns {string[]} */
    getChildNoteIds() {
-        return this.treeCache.children[this.noteId] || [];
+        return this.children;
    }

    /** @returns {Promise&lt;NoteShort[]>} */
    async getChildNotes() {
-        return await this.treeCache.getNotes(this.getChildNoteIds());
+        return await this.treeCache.getNotes(this.children);
    }

    /**
@@ -112,7 +184,8 @@ class NoteShort {
     */
    async getAttributes(name) {
        if (!this.attributeCache) {
-            this.attributeCache = await server.get('notes/' + this.noteId + '/attributes');
+            this.attributeCache = (await server.get('notes/' + this.noteId + '/attributes'))
+                .map(attrRow => new Attribute(this.treeCache, attrRow));
        }

        if (name) {
@@ -224,12 +297,27 @@ class NoteShort {

    /**
     * @param {string} name
-     * @returns {Promise&lt;Note>|null} target note of the relation or null (if target is empty or note was not found)
+     * @returns {Promise&lt;NoteShort>|null} target note of the relation or null (if target is empty or note was not found)
     */
    async getRelationTarget(name) {
-        const relation = await this.getRelation(name);
+        const targets = await this.getRelationTargets(name);

-        return relation ? await repository.getNote(relation.value) : null;
+        return targets.length > 0 ? targets[0] : null;
+    }
+
+    /**
+     * @param {string} [name] - relation name to filter
+     * @returns {Promise&lt;NoteShort[]>}
+     */
+    async getRelationTargets(name) {
+        const relations = await this.getRelations(name);
+        const targets = [];
+
+        for (const relation of relations) {
+            targets.push(await this.treeCache.getNote(relation.value));
+        }
+
+        return targets;
    }

    /**
@@ -240,6 +328,16 @@ class NoteShort {
        this.attributeCache = null;
    }

+    /**
+     * Get relations which target this note
+     *
+     * @returns {Promise&lt;Attribute[]>}
+     */
+    async getTargetRelations() {
+        return (await server.get('notes/' + this.noteId + '/target-relations'))
+            .map(attrRow => new Attribute(this.treeCache, attrRow));
+    }
+
    get toString() {
        return `Note(noteId=${this.noteId}, title=${this.title})`;
    }
@@ -270,7 +368,7 @@ export default NoteShort;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -303,7 +303,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line56">line 56</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line72">line 72</a>
    </li></ul></dd>
    

@@ -339,7 +339,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -56,7 +56,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -1,12 +1,12 @@
 /*global document */
-(function() {
-    var source = document.getElementsByClassName('prettyprint source linenums');
-    var i = 0;
-    var lineNumber = 0;
-    var lineId;
-    var lines;
-    var totalLines;
-    var anchorHash;
+(() => {
+    const source = document.getElementsByClassName('prettyprint source linenums');
+    let i = 0;
+    let lineNumber = 0;
+    let lineId;
+    let lines;
+    let totalLines;
+    let anchorHash;

    if (source && source[0]) {
        anchorHash = document.location.hash.substring(1);
@@ -15,7 +15,7 @@

        for (; i < totalLines; i++) {
            lineNumber++;
-            lineId = 'line' + lineNumber;
+            lineId = `line${lineNumber}`;
            lines[i].id = lineId;
            if (lineId === anchorHash) {
                lines[i].className += ' selected';
@@ -29,14 +29,16 @@
            <pre class="prettyprint source linenums"><code>import treeService from './tree.js';
 import server from './server.js';
 import utils from './utils.js';
-import infoService from './info.js';
+import toastService from './toast.js';
 import linkService from './link.js';
 import treeCache from './tree_cache.js';
 import noteDetailService from './note_detail.js';
-import noteTypeService from './note_type.js';
 import noteTooltipService from './note_tooltip.js';
-import protectedSessionService from'./protected_session.js';
-import dateNotesService from'./date_notes.js';
+import protectedSessionService from './protected_session.js';
+import dateNotesService from './date_notes.js';
+import StandardWidget from '../widgets/standard_widget.js';
+import ws from "./ws.js";
+import hoistedNoteService from "./hoisted_note.js";

 /**
 * This is the main frontend API interface for scripts. It's published in the local "api" object.
@@ -44,9 +46,12 @@ import dateNotesService from'./date_notes.js';
 * @constructor
 * @hideconstructor
 */
-function FrontendScriptApi(startNote, currentNote, originEntity = null, tabContext = null) {
+function FrontendScriptApi(startNote, currentNote, originEntity = null, tabContext = null, $container = null) {
    const $pluginButtons = $("#plugin-buttons");

+    /** @property {jQuery} container of all the rendered script content */
+    this.$container = $container;
+
    /** @property {object} note where script started executing */
    this.startNote = startNote;
    /** @property {object} note where script is currently executing */
@@ -60,6 +65,9 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
    /** @property {TabContext|null} - experimental! */
    this.tabContext = tabContext;

+    /** @property {StandardWidget} */
+    this.StandardWidget = StandardWidget;
+
    /**
     * Activates note in the tree and in the note detail.
     *
@@ -67,7 +75,15 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     * @param {string} notePath (or noteId)
     * @returns {Promise&lt;void>}
     */
-    this.activateNote = treeService.activateNote;
+    this.activateNote = async (notePath, noteLoadedListener) => {
+        await treeService.activateNote(notePath, async () => {
+            await treeService.scrollToActiveNote();
+
+            if (noteLoadedListener) {
+                noteLoadedListener();
+            }
+        });
+    };

    /**
     * Activates newly created note. Compared to this.activateNote() also refreshes tree.
@@ -115,7 +131,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
        }

        if (opts.shortcut) {
-            $(document).bind('keydown', opts.shortcut, opts.action);
+            utils.bindGlobalShortcut(opts.shortcut, opts.action);

            button.attr("title", "Shortcut " + opts.shortcut);
        }
@@ -156,9 +172,14 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
            currentNoteId: currentNote.noteId,
            originEntityName: "notes", // currently there's no other entity on frontend which can trigger event
            originEntityId: originEntity ? originEntity.noteId : null
+        }, {
+            'trilium-source-id': "script"
        });

        if (ret.success) {
+            // wait until all the changes done in the script has been synced to frontend before continuing
+            await ws.waitForSyncId(ret.maxSyncId);
+
            return ret.executionResult;
        }
        else {
@@ -219,16 +240,10 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
    this.getNotes = async (noteIds, silentNotFoundError = false) => await treeCache.getNotes(noteIds, silentNotFoundError);

    /**
-     * @param {string} noteId
+     * @param {string[]} noteIds
     * @method
     */
-    this.reloadChildren = async noteId => await treeCache.reloadChildren(noteId);
-
-    /**
-     * @param {string} noteId
-     * @method
-     */
-    this.reloadParents = async noteId => await treeCache.reloadParents(noteId);
+    this.reloadNotes = async noteIds => await treeCache.reloadNotes(noteIds);

    /**
     * Instance name identifies particular Trilium instance. It can be useful for scripts
@@ -258,7 +273,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     * @method
     * @param {string} message
     */
-    this.showMessage = infoService.showMessage;
+    this.showMessage = toastService.showMessage;

    /**
     * Show error message to the user.
@@ -266,7 +281,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     * @method
     * @param {string} message
     */
-    this.showError = infoService.showError;
+    this.showError = toastService.showError;

    /**
     * Refresh tree
@@ -289,17 +304,13 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     * @method
     * @returns {NoteFull} active note (loaded into right pane)
     */
-    this.getActiveNote = noteDetailService.getActiveNote;
+    this.getActiveTabNote = noteDetailService.getActiveTabNote;

    /**
     * @method
     * @returns {Promise&lt;string|null>} returns note path of active note or null if there isn't active note
     */
-    this.getActiveNotePath = () => {
-        const activeTabContext = noteDetailService.getActiveTabContext();
-
-        return activeTabContext ? activeTabContext.notePath : null;
-    };
+    this.getActiveTabNotePath = noteDetailService.getActiveTabNotePath;

    /**
     * This method checks whether user navigated away from the note from which the scripts has been started.
@@ -311,7 +322,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     * @return {boolean} returns true if the original note is still loaded, false if user switched to another
     */
    this.isNoteStillActive = () => {
-        return this.originEntity.noteId === tabContext.noteId;
+        return tabContext.note &amp;&amp; this.originEntity.noteId === tabContext.note.noteId;
    };

    /**
@@ -320,24 +331,6 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     */
    this.onNoteChange = noteDetailService.onNoteChange;

-    /**
-     * @method
-     * @returns {array} list of default code mime types
-     */
-    this.getDefaultCodeMimeTypes = noteTypeService.getDefaultCodeMimeTypes;
-
-    /**
-     * @method
-     * @returns {array} list of currently used code mime types
-     */
-    this.getCodeMimeTypes = noteTypeService.getCodeMimeTypes;
-
-    /**
-     * @method
-     * @param {array} types - list of mime types to be used
-     */
-    this.setCodeMimeTypes = noteTypeService.setCodeMimeTypes;
-
    /**
     * @method
     * @param {object} $el - jquery object on which to setup the tooltip
@@ -383,6 +376,15 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     * @return {Promise&lt;NoteShort>}
     */
    this.getYearNote = dateNotesService.getYearNote;
+
+    /**
+     * Hoist note. See https://github.com/zadam/trilium/wiki/Note-hoisting
+     *
+     * @method
+     * @param {string} noteId - set hoisted note. 'root' will effectively unhoist
+     * @return {Promise}
+     */
+    this.setHoistedNoteId = hoistedNoteService.setHoistedNoteId;
 }

 export default FrontendScriptApi;</code></pre>
@@ -401,7 +403,7 @@ export default FrontendScriptApi;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>

 <script> prettyPrint(); </script>
@@ -273,7 +273,7 @@ tr > th:last-child { border-right: 1px solid #ddd; }
    margin: 0;
 }

-.prettyprint
+.source
 {
    border: 1px solid #ddd;
    width: 80%;
@@ -284,7 +284,7 @@ tr > th:last-child { border-right: 1px solid #ddd; }
    width: inherit;
 }

-.prettyprint code
+.source code
 {
    font-size: 100%;
    line-height: 18px;
@@ -1,18 +1,15 @@
 'use strict';

-const electron = require('electron');
+const {app, globalShortcut, BrowserWindow} = require('electron');
 const path = require('path');
 const log = require('./src/services/log');
 const sqlInit = require('./src/services/sql_init');
 const cls = require('./src/services/cls');
 const url = require("url");
 const port = require('./src/services/port');
+const env = require('./src/services/env');
 const appIconService = require('./src/services/app_icon');
 const windowStateKeeper = require('electron-window-state');
-const contextMenu = require('electron-context-menu');
-
-const app = electron.app;
-const globalShortcut = electron.globalShortcut;

 // Adds debug features like hotkeys for triggering dev tools and reload
 require('electron-debug')();
@@ -24,25 +21,25 @@ let mainWindow;

 require('electron-dl')({ saveAs: true });

-contextMenu({
-    menu: (actions, params, browserWindow) => [
-        actions.cut(),
-        actions.copy(),
-        actions.copyLink(),
-        actions.paste(),
-        {
-            label: 'Search DuckDuckGo for “{selection}”',
-            // Only show it when right-clicking text
-            visible: params.selectionText.trim().length > 0,
-            click: () => {
-                const {shell} = require('electron');
-
-                shell.openExternal(`https://duckduckgo.com?q=${encodeURIComponent(params.selectionText)}`);
-            }
-        },
-        actions.inspect()
-    ]
-});
+// contextMenu({
+//     menu: (actions, params, browserWindow) => [
+//         actions.cut(),
+//         actions.copy(),
+//         actions.copyLink(),
+//         actions.paste(),
+//         {
+//             label: 'Search DuckDuckGo for “{selection}”',
+//             // Only show it when right-clicking text
+//             visible: params.selectionText.trim().length > 0,
+//             click: () => {
+//                 const {shell} = require('electron');
+//
+//                 shell.openExternal(`https://duckduckgo.com?q=${encodeURIComponent(params.selectionText)}`);
+//             }
+//         },
+//         actions.inspect()
+//     ]
+// });

 function onClosed() {
    // Dereference the window
@@ -65,7 +62,7 @@ async function createMainWindow() {
        defaultHeight: 800
    });

-    const win = new electron.BrowserWindow({
+    const win = new BrowserWindow({
        x: mainWindowState.x,
        y: mainWindowState.y,
        width: mainWindowState.width,
@@ -74,7 +71,7 @@ async function createMainWindow() {
        webPreferences: {
            nodeIntegration: true
        },
-        icon: path.join(__dirname, 'images/app-icons/png/256x256.png')
+        icon: path.join(__dirname, 'images/app-icons/png/256x256' + (env.isDev() ? '-dev' : '') + '.png')
    });

    mainWindowState.manage(win);
@@ -29,8 +29,8 @@

    async function validatorJavaScript(text, options) {
        if (glob.isMobile()
-            || glob.getActiveNote() == null
-            || glob.getActiveNote().mime === 'application/json') {
+            || glob.getActiveTabNote() == null
+            || glob.getActiveTabNote().mime === 'application/json') {
            // eslint doesn't seem to validate pure JSON well
            return [];
        }
@@ -13,7 +13,8 @@
 .CodeMirror-lines {
  padding: 4px 0; /* Vertical padding around content */
 }
-.CodeMirror pre {
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
  padding: 0 4px; /* Horizontal padding of content */
 }

@@ -96,7 +97,7 @@

 .CodeMirror-rulers {
  position: absolute;
-  left: 0; right: 0; top: -50px; bottom: -20px;
+  left: 0; right: 0; top: -50px; bottom: 0;
  overflow: hidden;
 }
 .CodeMirror-ruler {
@@ -236,7 +237,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
  cursor: text;
  min-height: 1px; /* prevents collapsing before first draw */
 }
-.CodeMirror pre {
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
  /* Reset some styles that the rest of the page might have set */
  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
  border-width: 0;
@@ -255,7 +257,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
  -webkit-font-variant-ligatures: contextual;
  font-variant-ligatures: contextual;
 }
-.CodeMirror-wrap pre {
+.CodeMirror-wrap pre.CodeMirror-line,
+.CodeMirror-wrap pre.CodeMirror-line-like {
  word-wrap: break-word;
  white-space: pre-wrap;
  word-break: normal;
@@ -2284,7 +2284,7 @@
  function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}
  function paddingH(display) {
    if (display.cachedPaddingH) { return display.cachedPaddingH }
-    var e = removeChildrenAndAdd(display.measure, elt("pre", "x"));
+    var e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-line-like"));
    var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
    var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};
    if (!isNaN(data.left) && !isNaN(data.right)) { display.cachedPaddingH = data; }
@@ -2678,7 +2678,7 @@
  function PosWithInfo(line, ch, sticky, outside, xRel) {
    var pos = Pos(line, ch, sticky);
    pos.xRel = xRel;
-    if (outside) { pos.outside = true; }
+    if (outside) { pos.outside = outside; }
    return pos
  }

@@ -2687,16 +2687,16 @@
  function coordsChar(cm, x, y) {
    var doc = cm.doc;
    y += cm.display.viewOffset;
-    if (y < 0) { return PosWithInfo(doc.first, 0, null, true, -1) }
+    if (y < 0) { return PosWithInfo(doc.first, 0, null, -1, -1) }
    var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
    if (lineN > last)
-      { return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, true, 1) }
+      { return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, 1, 1) }
    if (x < 0) { x = 0; }

    var lineObj = getLine(doc, lineN);
    for (;;) {
      var found = coordsCharInner(cm, lineObj, lineN, x, y);
-      var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 ? 1 : 0));
+      var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 || found.outside > 0 ? 1 : 0));
      if (!collapsed) { return found }
      var rangeEnd = collapsed.find(1);
      if (rangeEnd.line == lineN) { return rangeEnd }
@@ -2784,7 +2784,7 @@
      // base X position
      var coords = cursorCoords(cm, Pos(lineNo$$1, ch, sticky), "line", lineObj, preparedMeasure);
      baseX = coords.left;
-      outside = y < coords.top || y >= coords.bottom;
+      outside = y < coords.top ? -1 : y >= coords.bottom ? 1 : 0;
    }

    ch = skipExtendingChars(lineObj.text, ch, 1);
@@ -2853,7 +2853,7 @@
  function textHeight(display) {
    if (display.cachedTextHeight != null) { return display.cachedTextHeight }
    if (measureText == null) {
-      measureText = elt("pre");
+      measureText = elt("pre", null, "CodeMirror-line-like");
      // Measure a bunch of lines, for browsers that compute
      // fractional heights.
      for (var i = 0; i < 49; ++i) {
@@ -2873,7 +2873,7 @@
  function charWidth(display) {
    if (display.cachedCharWidth != null) { return display.cachedCharWidth }
    var anchor = elt("span", "xxxxxxxxxx");
-    var pre = elt("pre", [anchor]);
+    var pre = elt("pre", [anchor], "CodeMirror-line-like");
    removeChildrenAndAdd(display.measure, pre);
    var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;
    if (width > 2) { display.cachedCharWidth = width; }
@@ -5147,8 +5147,15 @@
    var line = getLine(doc, pos.line);
    if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {
      var sp = line.markedSpans[i], m = sp.marker;
-      if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
-          (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+
+      // Determine if we should prevent the cursor being placed to the left/right of an atomic marker
+      // Historically this was determined using the inclusiveLeft/Right option, but the new way to control it
+      // is with selectLeft/Right
+      var preventCursorLeft = ("selectLeft" in m) ? !m.selectLeft : m.inclusiveLeft;
+      var preventCursorRight = ("selectRight" in m) ? !m.selectRight : m.inclusiveRight;
+
+      if ((sp.from == null || (preventCursorLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+          (sp.to == null || (preventCursorRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
        if (mayClear) {
          signal(m, "beforeCursorEnter");
          if (m.explicitlyCleared) {
@@ -5160,14 +5167,14 @@

        if (oldPos) {
          var near = m.find(dir < 0 ? 1 : -1), diff = (void 0);
-          if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
+          if (dir < 0 ? preventCursorRight : preventCursorLeft)
            { near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null); }
          if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
            { return skipAtomicInner(doc, near, pos, dir, mayClear) }
        }

        var far = m.find(dir < 0 ? -1 : 1);
-        if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
+        if (dir < 0 ? preventCursorLeft : preventCursorRight)
          { far = movePos(doc, far, dir, far.line == pos.line ? line : null); }
        return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
      }
@@ -5396,6 +5403,9 @@
    if (doc.cm) { makeChangeSingleDocInEditor(doc.cm, change, spans); }
    else { updateDoc(doc, change, spans); }
    setSelectionNoUndo(doc, selAfter, sel_dontScroll);
+
+    if (doc.cantEdit && skipAtomic(doc, Pos(doc.firstLine(), 0)))
+      { doc.cantEdit = false; }
  }

  // Handle the interaction of a change to a document with the editor
@@ -7700,7 +7710,7 @@
      for (var i = newBreaks.length - 1; i >= 0; i--)
        { replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); }
    });
-    option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g, function (cm, val, old) {
+    option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) {
      cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
      if (old != Init) { cm.refresh(); }
    });
@@ -9748,7 +9758,7 @@

  addLegacyProps(CodeMirror);

-  CodeMirror.version = "5.47.0";
+  CodeMirror.version = "5.48.4";

  return CodeMirror;

@@ -9,7 +9,7 @@
 *    Description:  CodeMirror mode for Asterisk dialplan
 *
 *        Created:  05/17/2012 09:20:25 PM
- *       Revision:  none
+ *       Revision:  08/05/2019 AstLinux Project: Support block-comments
 *
 *         Author:  Stas Kobzar (stas@modulis.ca),
 *        Company:  Modulis.ca Inc.
@@ -67,7 +67,26 @@ CodeMirror.defineMode("asterisk", function() {
    var cur = '';
    var ch = stream.next();
    // comment
+    if (state.blockComment) {
+      if (ch == "-" && stream.match("-;", true)) {
+        state.blockComment = false;
+      } else if (stream.skipTo("--;")) {
+        stream.next();
+        stream.next();
+        stream.next();
+        state.blockComment = false;
+      } else {
+        stream.skipToEnd();
+      }
+      return "comment";
+    }
    if(ch == ";") {
+      if (stream.match("--", true)) {
+        if (!stream.match("-", false)) {  // Except ;--- is not a block comment
+          state.blockComment = true;
+          return "comment";
+        }
+      }
      stream.skipToEnd();
      return "comment";
    }
@@ -124,6 +143,7 @@ CodeMirror.defineMode("asterisk", function() {
  return {
    startState: function() {
      return {
+        blockComment: false,
        extenStart: false,
        extenSame:  false,
        extenInclude: false,
@@ -187,7 +207,11 @@ CodeMirror.defineMode("asterisk", function() {
      }

      return null;
-    }
+    },
+
+    blockCommentStart: ";--",
+    blockCommentEnd: "--;",
+    lineComment: ";"
  };
 });

@@ -467,7 +467,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
  def("text/x-java", {
    name: "clike",
    keywords: words("abstract assert break case catch class const continue default " +
-                    "do else enum extends final finally float for goto if implements import " +
+                    "do else enum extends final finally for goto if implements import " +
                    "instanceof interface native new package private protected public " +
                    "return static strictfp super switch synchronized this throw throws transient " +
                    "try volatile while @interface"),
@@ -136,4 +136,30 @@
     "[comment ///// let / me / show / you /////]",
     "[comment */]");

+  var mode_java = CodeMirror.getMode({indentUnit: 2}, "text/x-java");
+  function MTJAVA(name) { test.mode("java_" + name, mode_java, Array.prototype.slice.call(arguments, 1)); }
+  MTJAVA("types",
+         "[type byte];",
+         "[type short];",
+         "[type int];",
+         "[type long];",
+         "[type float];",
+         "[type double];",
+         "[type boolean];",
+         "[type char];",
+         "[type void];",
+         "[type Boolean];",
+         "[type Byte];",
+         "[type Character];",
+         "[type Double];",
+         "[type Float];",
+         "[type Integer];",
+         "[type Long];",
+         "[type Number];",
+         "[type Object];",
+         "[type Short];",
+         "[type String];",
+         "[type StringBuffer];",
+         "[type StringBuilder];",
+         "[type Void];");
 })();
@@ -78,6 +78,15 @@
        if (!stream.eat("*")) return false
        state.tokenize = tokenNestedComment(1)
        return state.tokenize(stream, state)
+      },
+      token: function(stream, _, style) {
+        if (style == "variable") {
+          // Assume uppercase symbols are classes using variable-2
+          var isUpper = RegExp('^[_$]*[A-Z][a-zA-Z0-9_$]*$','g');
+          if (isUpper.test(stream.current())) {
+            return 'variable-2';
+          }
+        }
      }
    }
  });
@@ -221,7 +221,10 @@ CodeMirror.defineMode("groovy", function(config) {

    electricChars: "{}",
    closeBrackets: {triples: "'\""},
-    fold: "brace"
+    fold: "brace",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
  };
 });

@@ -13,10 +13,14 @@

  CodeMirror.defineSimpleMode("handlebars-tags", {
    start: [
+      { regex: /\{\{\{/, push: "handlebars_raw", token: "tag" },
      { regex: /\{\{!--/, push: "dash_comment", token: "comment" },
      { regex: /\{\{!/,   push: "comment", token: "comment" },
      { regex: /\{\{/,    push: "handlebars", token: "tag" }
    ],
+    handlebars_raw: [
+      { regex: /\}\}\}/, pop: true, token: "tag" },
+    ],
    handlebars: [
      { regex: /\}\}/, pop: true, token: "tag" },

@@ -41,6 +41,8 @@

 {{! one line comment }}

+{{{propertyContainingRawHtml}}}
+
 {{#each articles}}
  {{~title}}
  <p>{{excerpt body size=120 ellipsis=true}}</p>
@@ -67,7 +67,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
    if (ch == '"' || ch == "'") {
      state.tokenize = tokenString(ch);
      return state.tokenize(stream, state);
-    } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) {
+    } else if (ch == "." && stream.match(/^\d[\d_]*(?:[eE][+\-]?[\d_]+)?/)) {
      return ret("number", "number");
    } else if (ch == "." && stream.match("..")) {
      return ret("spread", "meta");
@@ -75,10 +75,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
      return ret(ch);
    } else if (ch == "=" && stream.eat(">")) {
      return ret("=>", "operator");
-    } else if (ch == "0" && stream.match(/^(?:x[\da-f]+|o[0-7]+|b[01]+)n?/i)) {
+    } else if (ch == "0" && stream.match(/^(?:x[\dA-Fa-f_]+|o[0-7_]+|b[01_]+)n?/)) {
      return ret("number", "number");
    } else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:n|(?:\.\d*)?(?:[eE][+\-]?\d+)?)?/);
+      stream.match(/^[\d_]*(?:n|(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)?/);
      return ret("number", "number");
    } else if (ch == "/") {
      if (stream.eat("*")) {
@@ -195,8 +195,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
        ++depth;
      } else if (wordRE.test(ch)) {
        sawSomething = true;
-      } else if (/["'\/]/.test(ch)) {
-        return;
+      } else if (/["'\/`]/.test(ch)) {
+        for (;; --pos) {
+          if (pos == 0) return
+          var next = stream.string.charAt(pos - 1)
+          if (next == ch && stream.string.charAt(pos - 2) != "\\") { pos--; break }
+        }
      } else if (sawSomething && !depth) {
        ++pos;
        break;
@@ -574,10 +578,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
  }
  function maybetype(type, value) {
    if (isTS) {
-      if (type == ":" || value == "in") return cont(typeexpr);
+      if (type == ":") return cont(typeexpr);
      if (value == "?") return cont(maybetype);
    }
  }
+  function maybetypeOrIn(type, value) {
+    if (isTS && (type == ":" || value == "in")) return cont(typeexpr)
+  }
  function mayberettype(type) {
    if (isTS && type == ":") {
      if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr)
@@ -618,7 +625,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
    } else if (type == ":") {
      return cont(typeexpr)
    } else if (type == "[") {
-      return cont(expect("variable"), maybetype, expect("]"), typeprop)
+      return cont(expect("variable"), maybetypeOrIn, expect("]"), typeprop)
    } else if (type == "(") {
      return pass(functiondecl, typeprop)
    }
@@ -127,6 +127,9 @@
     "[keyword let] [def f] [operator =] ([[ [def a], [def b] ]], [def c]) [operator =>] [variable-2 a] [operator +] [variable-2 c];",
     "[variable c];");

+  MT("fatArrow_stringDefault",
+     "([def a], [def b] [operator =] [string 'x\\'y']) [operator =>] [variable-2 a] [operator +] [variable-2 b]")
+
  MT("spread",
     "[keyword function] [def f]([def a], [meta ...][def b]) {",
     "  [variable something]([variable-2 a], [meta ...][variable-2 b]);",
@@ -298,6 +301,22 @@
     "[keyword return]",
     "{} [string-2 /5/]")

+  MT("numeric separator",
+     "[number 123_456];",
+     "[number 0xdead_c0de];",
+     "[number 0o123_456];",
+     "[number 0b1101_1101];",
+     "[number .123_456e0_1];",
+     "[number 1E+123_456];",
+     "[number 12_34_56n];")
+
+  MT("underscore property",
+     "[variable something].[property _property];",
+     "[variable something].[property _123];",
+     "[variable something].[property _for];",
+     "[variable _for];",
+     "[variable _123];")
+
  var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
  function TS(name) {
    test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))
@@ -187,15 +187,13 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
      var imMatcher = RegExp(/^im\b/);
      var numberLiteral = false;
      // Floats
-      if (stream.match(/^\d*\.(?!\.)\d*([Eef][\+\-]?\d+)?/i)) { numberLiteral = true; }
-      if (stream.match(/^\d+\.(?!\.)\d*/)) { numberLiteral = true; }
-      if (stream.match(/^\.\d+/)) { numberLiteral = true; }
-      if (stream.match(/^0x\.[0-9a-f]+p[\+\-]?\d+/i)) { numberLiteral = true; }
+      if (stream.match(/^(?:(?:\d[_\d]*)?\.(?!\.)(?:\d[_\d]*)?|\d[_\d]*\.(?!\.)(?:\d[_\d]*))?([Eef][\+\-]?[_\d]+)?/i)) { numberLiteral = true; }
+      if (stream.match(/^0x\.[0-9a-f_]+p[\+\-]?[_\d]+/i)) { numberLiteral = true; }
      // Integers
-      if (stream.match(/^0x[0-9a-f]+/i)) { numberLiteral = true; } // Hex
-      if (stream.match(/^0b[01]+/i)) { numberLiteral = true; } // Binary
-      if (stream.match(/^0o[0-7]+/i)) { numberLiteral = true; } // Octal
-      if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) { numberLiteral = true; } // Decimal
+      if (stream.match(/^0x[0-9a-f_]+/i)) { numberLiteral = true; } // Hex
+      if (stream.match(/^0b[01_]+/i)) { numberLiteral = true; } // Binary
+      if (stream.match(/^0o[0-7_]+/i)) { numberLiteral = true; } // Octal
+      if (stream.match(/^[1-9][_\d]*(e[\+\-]?\d+)?/)) { numberLiteral = true; } // Decimal
      // Zero by itself with no other piece of number.
      if (stream.match(/^0(?![\dx])/i)) { numberLiteral = true; }
      if (numberLiteral) {
@@ -20,7 +20,7 @@
    {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h", "ino"]},
    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
    {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
-    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
+    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp", "cs"]},
    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
    {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
    {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
@@ -71,7 +71,7 @@
    {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
    {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},
    {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript", "application/javascript;env=frontend", "application/javascript;env=backend"],
-     mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
+      mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
    {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
    {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
@@ -105,6 +105,7 @@
    {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
    {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
    {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
+    {name: "PostgreSQL", mime: "text/x-pgsql", mode: "sql"},
    {name: "PowerShell", mime: "application/x-powershell", mode: "powershell", ext: ["ps1", "psd1", "psm1"]},
    {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
    {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
@@ -26,6 +26,8 @@
    "literal": { },
    "msg": {},
    "fallbackmsg": { noEndTag: true, reduceIndent: true},
+    "select": {},
+    "plural": {},
    "let": { soyState: "var-def" },
    "if": {},
    "elseif": { noEndTag: true, reduceIndent: true},
@@ -41,7 +41,7 @@ CodeMirror.defineMode("sparql", function(config) {
      if(ch == "?" && stream.match(/\s/, false)){
        return "operator";
      }
-      stream.match(/^[\w\d]*/);
+      stream.match(/^[A-Za-z0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD][A-Za-z0-9_\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]*/);
      return "variable-2";
    }
    else if (ch == "<" && !stream.match(/^[\s\u00a0=]/, false)) {
@@ -1,4 +1,4 @@
-/*! jQuery Fancytree Plugin - 2.31.0 - 2019-05-31T11:32:38Z
+/*! jQuery Fancytree Plugin - 2.33.0 - 2019-10-29T08:00:07Z
  * https://github.com/mar10/fancytree
  * Copyright (c) 2019 Martin Wendt; Licensed MIT
 */
@@ -1365,8 +1365,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 /** Core Fancytree module.
@@ -1405,6 +1405,7 @@ var uniqueId = $.fn.extend( {
 		REX_HTML = /[&<>"'/]/g, // Escape those characters
 		REX_TOOLTIP = /[<>"'/]/g, // Don't escape `&` in tooltips
 		RECURSIVE_REQUEST_ERROR = "$recursive_request",
+		// CLIPBOARD = null,
 		ENTITY_MAP = {
 			"&": "&amp;",
 			"<": "&lt;",
@@ -1831,7 +1832,7 @@ var uniqueId = $.fn.extend( {
 	 *     For lazy nodes, null or undefined means 'not yet loaded'. Use an empty array
 	 *     to define a node that has no children.
 	 * @property {boolean} expanded Use isExpanded(), setExpanded() to access this property.
-	 * @property {string} extraClasses Additional CSS classes, added to the node's `&lt;span>`.<br>
+	 * @property {string} extraClasses Additional CSS classes, added to the node's `<span>`.<br>
 	 *     Note: use `node.add/remove/toggleClass()` to modify.
 	 * @property {boolean} folder Folder nodes have different default icons and click behavior.<br>
 	 *     Note: Also non-folders may have children.
@@ -2130,6 +2131,17 @@ var uniqueId = $.fn.extend( {
 		appendSibling: function(node) {
 			return this.addNode(node, "after");
 		},
+		/**
+		 * (experimental) Apply a modification (or navigation) operation.
+		 *
+		 * @param {string} cmd
+		 * @param {object} [opts]
+		 * @see Fancytree#applyCommand
+		 * @since 2.32
+		 */
+		applyCommand: function(cmd, opts) {
+			return this.tree.applyCommand(cmd, this, opts);
+		},
 		/**
 		 * Modify existing child nodes.
 		 *
@@ -2357,7 +2369,7 @@ var uniqueId = $.fn.extend( {
 		fixSelection3AfterClick: function(callOpts) {
 			var flag = this.isSelected();

-			//		this.debug("fixSelection3AfterClick()");
+			// this.debug("fixSelection3AfterClick()");

 			this.visit(function(node) {
 				node._changeSelectStatusAttrs(flag);
@@ -2377,7 +2389,7 @@ var uniqueId = $.fn.extend( {
 		fixSelection3FromEndNodes: function(callOpts) {
 			var opts = this.tree.options;

-			//		this.debug("fixSelection3FromEndNodes()");
+			// this.debug("fixSelection3FromEndNodes()");
 			_assert(opts.selectMode === 3, "expected selectMode 3");

 			// Visit all end nodes and adjust their parent's `selected` and `partsel`
@@ -2565,7 +2577,7 @@ var uniqueId = $.fn.extend( {
 		 * @returns {int}
 		 */
 		getIndex: function() {
-			//		return this.parent.children.indexOf(this);
+			// return this.parent.children.indexOf(this);
 			return $.inArray(this, this.parent.children); // indexOf doesn't work in IE7
 		},
 		/** Return the hierarchical child index (1-based, e.g. '3.2.4').
@@ -2744,6 +2756,21 @@ var uniqueId = $.fn.extend( {
 			}
 			return !!(this.children && this.children.length);
 		},
+		/**
+		 * Return true if node has `className` defined in .extraClasses.
+		 *
+		 * @param {string} className class name (separate multiple classes by space)
+		 * @returns {boolean}
+		 *
+		 * @since 2.32
+		 */
+		hasClass: function(className) {
+			return (
+				(" " + (this.extraClasses || "") + " ").indexOf(
+					" " + className + " "
+				) >= 0
+			);
+		},
 		/** Return true if node has keyboard focus.
 		 * @returns {boolean}
 		 */
@@ -2920,15 +2947,7 @@ var uniqueId = $.fn.extend( {
 			// i.e. return false for nodes (but not parents) that are hidden
 			// by a filter
 			if (hasFilter && !this.match && !this.subMatchCount) {
-				this.debug(
-					"isVisible: HIDDEN (" +
-						hasFilter +
-						", " +
-						this.match +
-						", " +
-						this.match +
-						")"
-				);
+				// this.debug( "isVisible: HIDDEN (" + hasFilter + ", " + this.match + ", " + this.match + ")" );
 				return false;
 			}

@@ -2936,7 +2955,7 @@ var uniqueId = $.fn.extend( {
 				n = parents[i];

 				if (!n.expanded) {
-					this.debug("isVisible: HIDDEN (parent collapsed)");
+					// this.debug("isVisible: HIDDEN (parent collapsed)");
 					return false;
 				}
 				// if (hasFilter && !n.match && !n.subMatchCount) {
@@ -2944,7 +2963,7 @@ var uniqueId = $.fn.extend( {
 				// 	return false;
 				// }
 			}
-			this.debug("isVisible: VISIBLE");
+			// this.debug("isVisible: VISIBLE");
 			return true;
 		},
 		/** Deprecated.
@@ -3141,7 +3160,7 @@ var uniqueId = $.fn.extend( {
 			// Handle cross-tree moves
 			if (tree !== targetNode.tree) {
 				// Fix node.tree for all source nodes
-				//			_assert(false, "Cross-tree move is not yet implemented.");
+				// 	_assert(false, "Cross-tree move is not yet implemented.");
 				this.warn("Cross-tree moveTo is experimental!");
 				this.visit(function(n) {
 					// TODO: fix selection state and activation, ...
@@ -3202,9 +3221,14 @@ var uniqueId = $.fn.extend( {
 		},
 		/** Set focus relative to this node and optionally activate.
 		 *
-		 * @param {number} where The keyCode that would normally trigger this move,
-		 *		e.g. `$.ui.keyCode.LEFT` would collapse the node if it
-		 *      is expanded or move to the parent oterwise.
+		 * 'left' collapses the node if it is expanded, or move to the parent
+		 * otherwise.
+		 * 'right' expands the node if it is collapsed, or move to the first
+		 * child otherwise.
+		 *
+		 * @param {string|number} where 'down', 'first', 'last', 'left', 'parent', 'right', or 'up'.
+		 *   (Alternatively the keyCode that would normally trigger this move,
+		 *   e.g. `$.ui.keyCode.LEFT` = 'left'.
 		 * @param {boolean} [activate=true]
 		 * @returns {$.Promise}
 		 */
@@ -3294,7 +3318,7 @@ var uniqueId = $.fn.extend( {
 		render: function(force, deep) {
 			return this.tree._callHook("nodeRender", this, force, deep);
 		},
-		/** Create HTML markup for the node's outer &lt;span> (expander, checkbox, icon, and title).
+		/** Create HTML markup for the node's outer `<span>` (expander, checkbox, icon, and title).
 		 * Implies {@link FancytreeNode#renderStatus}.
 		 * @see Fancytree_Hooks#nodeRenderTitle
 		 */
@@ -3471,7 +3495,7 @@ var uniqueId = $.fn.extend( {
 				newScrollTop = null;

 			// this.debug("scrollIntoView(), scrollTop=" + scrollTop, opts.scrollOfs);
-			//		_assert($(this.span).is(":visible"), "scrollIntoView node is invisible"); // otherwise we cannot calc offsets
+			// _assert($(this.span).is(":visible"), "scrollIntoView node is invisible"); // otherwise we cannot calc offsets
 			if (!this.isVisible()) {
 				// We cannot calc offsets for hidden elements
 				this.warn("scrollIntoView(): node is invisible.");
@@ -3646,13 +3670,15 @@ var uniqueId = $.fn.extend( {
 		 * The result is compatible with node.addChildren().
 		 *
 		 * @param {boolean} [recursive=false] include child nodes
-		 * @param {function} [callback] callback(dict, node) is called for every node, in order to allow modifications
+		 * @param {function} [callback] callback(dict, node) is called for every node, in order to allow modifications.
+		 *     Return `false` to ignore this node or "skip" to include this node without its children.
 		 * @returns {NodeData}
 		 */
 		toDict: function(recursive, callback) {
 			var i,
 				l,
 				node,
+				res,
 				dict = {},
 				self = this;

@@ -3668,7 +3694,13 @@ var uniqueId = $.fn.extend( {
 				}
 			}
 			if (callback) {
-				callback(dict, self);
+				res = callback(dict, self);
+				if (res === false) {
+					return false; // Don't include this node nor its children
+				}
+				if (res === "skip") {
+					recursive = false; // Include this node, but not the children
+				}
 			}
 			if (recursive) {
 				if (this.hasChildren()) {
@@ -3676,11 +3708,12 @@ var uniqueId = $.fn.extend( {
 					for (i = 0, l = this.children.length; i < l; i++) {
 						node = this.children[i];
 						if (!node.isStatusNode()) {
-							dict.children.push(node.toDict(true, callback));
+							res = node.toDict(true, callback);
+							if (res !== false) {
+								dict.children.push(res);
+							}
 						}
 					}
-				} else {
-					// dict.children = null;
 				}
 			}
 			return dict;
@@ -3937,7 +3970,7 @@ var uniqueId = $.fn.extend( {
 	 * @property {FancytreeNode} activeNode Currently active node or null.
 	 * @property {string} ariaPropName Property name of FancytreeNode that contains the element which will receive the aria attributes.
 	 *     Typically "li", but "tr" for table extension.
-	 * @property {jQueryObject} $container Outer &lt;ul> element (or &lt;table> element for ext-table).
+	 * @property {jQueryObject} $container Outer `<ul>` element (or `<table>` element for ext-table).
 	 * @property {jQueryObject} $div A jQuery object containing the element used to instantiate the tree widget (`widget.element`)
 	 * @property {object|array} columns Recommended place to store shared column meta data. @since 2.27
 	 * @property {object} data Metadata, i.e. properties that may be passed to `source` in addition to a children array.
@@ -4205,6 +4238,119 @@ var uniqueId = $.fn.extend( {
 		addPagingNode: function(node, mode) {
 			return this.rootNode.addPagingNode(node, mode);
 		},
+		/**
+		 * (experimental) Apply a modification (or navigation) operation.
+		 *
+		 * Valid commands:
+		 *   - 'moveUp', 'moveDown'
+		 *   - 'indent', 'outdent'
+		 *   - 'remove'
+		 *   - 'edit', 'addChild', 'addSibling': (reqires ext-edit extension)
+		 *   - 'cut', 'copy', 'paste': (use an internal singleton 'clipboard')
+		 *   - 'down', 'first', 'last', 'left', 'parent', 'right', 'up': navigate
+		 *
+		 * @param {string} cmd
+		 * @param {FancytreeNode} [node=active_node]
+		 * @param {object} [opts] Currently unused
+		 *
+		 * @since 2.32
+		 */
+		applyCommand: function(cmd, node, opts_) {
+			var // clipboard,
+				refNode;
+			// opts = $.extend(
+			// 	{ setActive: true, clipboard: CLIPBOARD },
+			// 	opts_
+			// );
+
+			node = node || this.getActiveNode();
+			// clipboard = opts.clipboard;
+
+			switch (cmd) {
+				// Sorting and indentation:
+				case "moveUp":
+					refNode = node.getPrevSibling();
+					if (refNode) {
+						node.moveTo(refNode, "before");
+						node.setActive();
+					}
+					break;
+				case "moveDown":
+					refNode = node.getNextSibling();
+					if (refNode) {
+						node.moveTo(refNode, "after");
+						node.setActive();
+					}
+					break;
+				case "indent":
+					refNode = node.getPrevSibling();
+					if (refNode) {
+						node.moveTo(refNode, "child");
+						refNode.setExpanded();
+						node.setActive();
+					}
+					break;
+				case "outdent":
+					if (!node.isTopLevel()) {
+						node.moveTo(node.getParent(), "after");
+						node.setActive();
+					}
+					break;
+				// Remove:
+				case "remove":
+					refNode = node.getPrevSibling() || node.getParent();
+					node.remove();
+					if (refNode) {
+						refNode.setActive();
+					}
+					break;
+				// Add, edit (requires ext-edit):
+				case "addChild":
+					node.editCreateNode("child", "");
+					break;
+				case "addSibling":
+					node.editCreateNode("after", "");
+					break;
+				case "rename":
+					node.editStart();
+					break;
+				// Simple clipboard simulation:
+				// case "cut":
+				// 	clipboard = { mode: cmd, data: node };
+				// 	break;
+				// case "copy":
+				// 	clipboard = {
+				// 		mode: cmd,
+				// 		data: node.toDict(function(n) {
+				// 			delete n.key;
+				// 		}),
+				// 	};
+				// 	break;
+				// case "clear":
+				// 	clipboard = null;
+				// 	break;
+				// case "paste":
+				// 	if (clipboard.mode === "cut") {
+				// 		// refNode = node.getPrevSibling();
+				// 		clipboard.data.moveTo(node, "child");
+				// 		clipboard.data.setActive();
+				// 	} else if (clipboard.mode === "copy") {
+				// 		node.addChildren(clipboard.data).setActive();
+				// 	}
+				// 	break;
+				// Navigation commands:
+				case "down":
+				case "first":
+				case "last":
+				case "left":
+				case "parent":
+				case "right":
+				case "up":
+					return node.navigate(cmd);
+				default:
+					$.error("Unhandled command: '" + cmd + "'");
+			}
+		},
 		/** (experimental) Modify existing data model.
 		 *
 		 * @param {Array} patchList array of [key, NodePatch] arrays
@@ -4403,8 +4549,9 @@ var uniqueId = $.fn.extend( {
 		/** Find a node relative to another node.
 		 *
 		 * @param {FancytreeNode} node
-		 * @param {number|string} where The keyCode that would normally trigger this move,
-		 *		or a keyword ('down', 'first', 'last', 'left', 'parent', 'right', 'up').
+		 * @param {string|number} where 'down', 'first', 'last', 'left', 'parent', 'right', or 'up'.
+		 *   (Alternatively the keyCode that would normally trigger this move,
+		 *   e.g. `$.ui.keyCode.LEFT` = 'left'.
 		 * @param {boolean} [includeHidden=false] Not yet implemented
 		 * @returns {FancytreeNode|null}
 		 * @since v2.31
@@ -4633,6 +4780,10 @@ var uniqueId = $.fn.extend( {
 		},
 		/**
 		 * Return an array of selected nodes.
+		 *
+		 * Note: you cannot send this result via Ajax directly. Instead the
+		 * node object need to be converted to plain objects, for example
+		 * by using `$.map()` and `node.toDict()`.
 		 * @param {boolean} [stopOnParents=false] only return the topmost selected
 		 *     node (useful with selectMode 3)
 		 * @returns {FancytreeNode[]}
@@ -4655,6 +4806,22 @@ var uniqueId = $.fn.extend( {
 				consoleApply("info", arguments);
 			}
 		},
+		/** Return true if any node is currently beeing loaded, i.e. a Ajax request is pending.
+		 * @returns {boolean}
+		 * @since 2.32
+		 */
+		isLoading: function() {
+			var res = false;
+
+			this.rootNode.visit(function(n) {
+				// also visit rootNode
+				if (n._isLoading || n._requestId) {
+					res = true;
+					return false;
+				}
+			}, true);
+			return res;
+		},
 		/*
 		TODO: isInitializing: function() {
 			return ( this.phase=="init" || this.phase=="postInit" );
@@ -4957,7 +5124,8 @@ var uniqueId = $.fn.extend( {
 		 * Return all nodes as nested list of {@link NodeData}.
 		 *
 		 * @param {boolean} [includeRoot=false] Returns the hidden system root node (and its children)
-		 * @param {function} [callback] callback(dict, node) is called for every node, in order to allow modifications
+		 * @param {function} [callback] callback(dict, node) is called for every node, in order to allow modifications.
+		 *     Return `false` to ignore this node or "skip" to include this node without its children.
 		 * @returns {Array | object}
 		 * @see FancytreeNode#toDict
 		 */
@@ -4976,7 +5144,7 @@ var uniqueId = $.fn.extend( {
 		 * @see EventData
 		 */
 		_triggerNodeEvent: function(type, node, originalEvent, extra) {
-			//		this.debug("_trigger(" + type + "): '" + ctx.node.title + "'", ctx);
+			// this.debug("_trigger(" + type + "): '" + ctx.node.title + "'", ctx);
 			var ctx = this._makeHookContext(node, originalEvent, extra),
 				res = this.widget._trigger(type, originalEvent, ctx);
 			if (res !== false && ctx.result !== undefined) {
@@ -4986,7 +5154,7 @@ var uniqueId = $.fn.extend( {
 		},
 		/* _trigger a widget event with additional tree data. */
 		_triggerTreeEvent: function(type, originalEvent, extra) {
-			//		this.debug("_trigger(" + type + ")", ctx);
+			// this.debug("_trigger(" + type + ")", ctx);
 			var ctx = this._makeHookContext(this, originalEvent, extra),
 				res = this.widget._trigger(type, originalEvent, ctx);

@@ -5829,7 +5997,7 @@ var uniqueId = $.fn.extend( {
 				this.nodeRemoveChildMarkup(ctx);
 			},
 			/**
-			 * Create `&lt;li>&lt;span>..&lt;/span> .. &lt;/li>` tags for this node.
+			 * Create `<li><span>..</span> .. </li>` tags for this node.
 			 *
 			 * This method takes care that all HTML markup is created that is required
 			 * to display this node in its current state.
@@ -5837,21 +6005,20 @@ var uniqueId = $.fn.extend( {
 			 * Call this method to create new nodes, or after the strucuture
 			 * was changed (e.g. after moving this node or adding/removing children)
 			 * nodeRenderTitle() and nodeRenderStatus() are implied.
-			 *
-			 * &lt;code>
-			 * &lt;li id='KEY' ftnode=NODE>
-			 *     &lt;span class='fancytree-node fancytree-expanded fancytree-has-children fancytree-lastsib fancytree-exp-el fancytree-ico-e'>
-			 *         &lt;span class="fancytree-expander">&lt;/span>
-			 *         &lt;span class="fancytree-checkbox">&lt;/span> // only present in checkbox mode
-			 *         &lt;span class="fancytree-icon">&lt;/span>
-			 *         &lt;a href="#" class="fancytree-title"> Node 1 &lt;/a>
-			 *     &lt;/span>
-			 *     &lt;ul> // only present if node has children
-			 *         &lt;li id='KEY' ftnode=NODE> child1 ... &lt;/li>
-			 *         &lt;li id='KEY' ftnode=NODE> child2 ... &lt;/li>
-			 *     &lt;/ul>
-			 * &lt;/li>
-			 * &lt;/code>
+			 * ```html
+			 * <li id='KEY' ftnode=NODE>
+			 *     <span class='fancytree-node fancytree-expanded fancytree-has-children fancytree-lastsib fancytree-exp-el fancytree-ico-e'>
+			 *         <span class="fancytree-expander"></span>
+			 *         <span class="fancytree-checkbox"></span> // only present in checkbox mode
+			 *         <span class="fancytree-icon"></span>
+			 *         <a href="#" class="fancytree-title"> Node 1 </a>
+			 *     </span>
+			 *     <ul> // only present if node has children
+			 *         <li id='KEY' ftnode=NODE> child1 ... </li>
+			 *         <li id='KEY' ftnode=NODE> child2 ... </li>
+			 *     </ul>
+			 * </li>
+			 * ```
 			 *
 			 * @param {EventData} ctx
 			 * @param {boolean} [force=false] re-render, even if html markup was already created
@@ -6034,12 +6201,12 @@ var uniqueId = $.fn.extend( {
 						// #486: successorLi is set, if we re-rendered (i.e. discarded)
 						// existing markup, which  we want to insert at the same position.
 						// (null is equivalent to append)
-						//				parent.ul.appendChild(node.li);
+						// 		parent.ul.appendChild(node.li);
 						parent.ul.insertBefore(node.li, successorLi);
 					}
 				}
 			},
-			/** Create HTML inside the node's outer &lt;span> (i.e. expander, checkbox,
+			/** Create HTML inside the node's outer `<span>` (i.e. expander, checkbox,
 			 * icon, and title).
 			 *
 			 * nodeRenderStatus() is implied.
@@ -6267,7 +6434,7 @@ var uniqueId = $.fn.extend( {
 					node = ctx.node,
 					tree = ctx.tree,
 					opts = ctx.options,
-					//			nodeContainer = node[tree.nodeContainerAttrName],
+					// 	nodeContainer = node[tree.nodeContainerAttrName],
 					hasChildren = node.hasChildren(),
 					isLastSib = node.isLastSibling(),
 					aria = opts.aria,
@@ -6469,9 +6636,9 @@ var uniqueId = $.fn.extend( {
 			 *
 			 * @param {EventData} ctx
 			 * @param {boolean} [flag=true]
-			 * @param {object} [opts] additional options. Defaults to {noAnimation: false, noEvents: false}
+			 * @param {object} [opts] additional options. Defaults to `{noAnimation: false, noEvents: false}`
 			 * @returns {$.Promise} The deferred will be resolved as soon as the (lazy)
-			 *     data was retrieved, rendered, and the expand animation finshed.
+			 *     data was retrieved, rendered, and the expand animation finished.
 			 */
 			nodeSetExpanded: function(ctx, flag, callOpts) {
 				callOpts = callOpts || {};
@@ -6543,7 +6710,13 @@ var uniqueId = $.fn.extend( {
 				dfd.done(function() {
 					var lastChild = node.getLastChild();

-					if (flag && opts.autoScroll && !noAnimation && lastChild) {
+					if (
+						flag &&
+						opts.autoScroll &&
+						!noAnimation &&
+						lastChild &&
+						tree._enableUpdate
+					) {
 						// Scroll down to last child, but keep current node visible
 						lastChild
 							.scrollIntoView(true, { topNode: node })
@@ -6602,9 +6775,7 @@ var uniqueId = $.fn.extend( {
 							$(node.li).addClass(cn.animating); // #717

 							if ($.isFunction($(node.ul)[effect.effect])) {
-								tree.debug(
-									"use jquery." + effect.effect + " method"
-								);
+								// tree.debug( "use jquery." + effect.effect + " method" );
 								$(node.ul)[effect.effect]({
 									duration: effect.duration,
 									always: function() {
@@ -7092,16 +7263,30 @@ var uniqueId = $.fn.extend( {
 					type = $container.data("type") || "html";
 					switch (type) {
 						case "html":
-							$ul = $container.find(">ul").first();
-							$ul.addClass(
-								"ui-fancytree-source fancytree-helper-hidden"
-							);
-							source = $.ui.fancytree.parseHtml($ul);
-							// allow to init tree.data.foo from <ul data-foo=''>
-							this.data = $.extend(
-								this.data,
-								_getElementDataAsDict($ul)
-							);
+							// There should be an embedded `<ul>` with initial nodes,
+							// but another `<ul class='fancytree-container'>` is appended
+							// to the tree's <div> on startup anyway.
+							$ul = $container
+								.find(">ul")
+								.not(".fancytree-container")
+								.first();
+
+							if ($ul.length) {
+								$ul.addClass(
+									"ui-fancytree-source fancytree-helper-hidden"
+								);
+								source = $.ui.fancytree.parseHtml($ul);
+								// allow to init tree.data.foo from <ul data-foo=''>
+								this.data = $.extend(
+									this.data,
+									_getElementDataAsDict($ul)
+								);
+							} else {
+								FT.warn(
+									"No `source` option was passed and container does not contain `<ul>`: assuming `source: []`."
+								);
+								source = [];
+							}
 							break;
 						case "json":
 							source = $.parseJSON($container.text());
@@ -7141,8 +7326,9 @@ var uniqueId = $.fn.extend( {
 					$.error("Not implemented");
 				}

-				// TODO: might be useful? Let's wait for a use case...
-				// tree._triggerTreeEvent("beforeInitLoad", null);
+				// preInit is fired when the widget markup is created, but nodes
+				// not yet loaded
+				tree._triggerTreeEvent("preInit", null);

 				// Trigger fancytreeinit after nodes have been loaded
 				dfd = this.nodeLoadChildren(rootCtx, source)
@@ -7425,7 +7611,7 @@ var uniqueId = $.fn.extend( {
 						);
 					}
 					// Add extension options as tree.options.EXTENSION
-					//			_assert(!this.tree.options[extName], "Extension name must not exist as option name: " + extName);
+					// 	_assert(!this.tree.options[extName], "Extension name must not exist as option name: " + extName);

 					// console.info("extend " + extName, extension.options, this.tree.options[extName])
 					// issue #876: we want to replace custom array-options, not merge them
@@ -7756,7 +7942,7 @@ var uniqueId = $.fn.extend( {
 		/** @lends Fancytree_Static# */
 		{
 			/** @type {string} */
-			version: "2.31.0", // Set to semver by 'grunt release'
+			version: "2.33.0", // Set to semver by 'grunt release'
 			/** @type {string} */
 			buildType: "production", // Set to 'production' by 'grunt build'
 			/** @type {int} */
@@ -7843,7 +8029,7 @@ var uniqueId = $.fn.extend( {
 					consoleApply("error", arguments);
 				}
 			},
-			/** Convert &lt;, &gt;, &amp;, &quot;, &#39;, &#x2F; to the equivalent entities.
+			/** Convert `<`, `>`, `&`, `"`, `'`, and `/` to the equivalent entities.
 			 *
 			 * @param {string} s
 			 * @returns {string}
@@ -8379,8 +8565,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 // To keep the global namespace clean, we wrap everything in a closure.
@@ -8499,7 +8685,7 @@ var uniqueId = $.fn.extend( {
 		// Every extension must be registered by a unique name.
 		name: "childcounter",
 		// Version information should be compliant with [semver](http://semver.org)
-		version: "2.31.0",
+		version: "2.33.0",

 		// Extension specific options and their defaults.
 		// This options will be available as `tree.options.childcounter.hideExpanded`
@@ -8610,8 +8796,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 (function(factory) {
@@ -8969,7 +9155,7 @@ var uniqueId = $.fn.extend( {
 	 */
 	$.ui.fancytree.registerExtension({
 		name: "clones",
-		version: "2.31.0",
+		version: "2.33.0",
 		// Default options for this extension.
 		options: {
 			highlightActiveClones: true, // set 'fancytree-active-clone' on active clones and all peers
@@ -9131,8 +9317,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 /*
@@ -9826,6 +10012,7 @@ var uniqueId = $.fn.extend( {
 	 */
 	function onDropEvent(event) {
 		var json,
+			allowAutoExpand,
 			nodeData,
 			isSourceFtNode,
 			r,
@@ -9951,13 +10138,16 @@ var uniqueId = $.fn.extend( {
 				// 		": dropEffect: " +
 				// 		dataTransfer.dropEffect
 				// );
+				prepareDropEffectCallback(event, data);
 				LAST_HIT_MODE = handleDragOver(event, data);

 				// The flag controls the preventDefault() below:
 				allowDrop = !!LAST_HIT_MODE;
+				allowAutoExpand =
+					LAST_HIT_MODE === "over" || LAST_HIT_MODE === false;

 				if (
-					LAST_HIT_MODE === "over" &&
+					allowAutoExpand &&
 					!node.expanded &&
 					node.hasChildren() !== false
 				) {
@@ -10132,7 +10322,7 @@ var uniqueId = $.fn.extend( {

 	$.ui.fancytree.registerExtension({
 		name: "dnd5",
-		version: "2.31.0",
+		version: "2.33.0",
 		// Default options for this extension.
 		options: {
 			autoExpandMS: 1500, // Expand nodes after n milliseconds of hovering
@@ -10265,8 +10455,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 (function(factory) {
@@ -10558,7 +10748,7 @@ var uniqueId = $.fn.extend( {
 	 */
 	$.ui.fancytree.registerExtension({
 		name: "edit",
-		version: "2.31.0",
+		version: "2.33.0",
 		// Default options for this extension.
 		options: {
 			adjustWidthOfs: 4, // null: don't adjust input size to content
@@ -10669,8 +10859,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 (function(factory) {
@@ -10799,6 +10989,7 @@ var uniqueId = $.fn.extend( {
 			!!opts.hideExpanders
 		);
 		// Reset current filter
+		this.rootNode.subMatchCount = 0;
 		this.visit(function(node) {
 			delete node.match;
 			delete node.titleWithHighlight;
@@ -10833,7 +11024,9 @@ var uniqueId = $.fn.extend( {
 				count++;
 				node.match = true;
 				node.visitParents(function(p) {
-					p.subMatchCount += 1;
+					if (p !== node) {
+						p.subMatchCount += 1;
+					}
 					// Expand match (unless this is no real match, but only a node in a matched branch)
 					if (opts.autoExpand && !matchedByBranch && !p.expanded) {
 						p.setExpanded(true, {
@@ -10843,7 +11036,7 @@ var uniqueId = $.fn.extend( {
 						});
 						p._filterAutoExpanded = true;
 					}
-				});
+				}, true);
 			}
 		});
 		treeOpts.autoCollapse = prevAutoCollapse;
@@ -10930,6 +11123,10 @@ var uniqueId = $.fn.extend( {
 		if (statusNode) {
 			statusNode.remove();
 		}
+		// we also counted root node's subMatchCount
+		delete this.rootNode.match;
+		delete this.rootNode.subMatchCount;
+
 		this.visit(function(node) {
 			if (node.match && node.span) {
 				// #491, #601
@@ -11001,7 +11198,7 @@ var uniqueId = $.fn.extend( {
 	 */
 	$.ui.fancytree.registerExtension({
 		name: "filter",
-		version: "2.31.0",
+		version: "2.33.0",
 		// Default options for this extension.
 		options: {
 			autoApply: true, // Re-apply last filter if lazy data is loaded
@@ -11121,8 +11318,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 (function(factory) {
@@ -11305,7 +11502,7 @@ var uniqueId = $.fn.extend( {

 	$.ui.fancytree.registerExtension({
 		name: "glyph",
-		version: "2.31.0",
+		version: "2.33.0",
 		// Default options for this extension.
 		options: {
 			preset: null, // 'awesome3', 'awesome4', 'bootstrap3', 'material'
@@ -11459,8 +11656,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 (function(factory) {
@@ -11577,7 +11774,7 @@ var uniqueId = $.fn.extend( {
 	 */
 	$.ui.fancytree.registerExtension({
 		name: "gridnav",
-		version: "2.31.0",
+		version: "2.33.0",
 		// Default options for this extension.
 		options: {
 			autofocusInput: false, // Focus first embedded input if node gets activated
@@ -11684,8 +11881,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 (function(factory) {
@@ -11714,7 +11911,7 @@ var uniqueId = $.fn.extend( {
 	 */
 	$.ui.fancytree.registerExtension({
 		name: "multi",
-		version: "2.31.0",
+		version: "2.33.0",
 		// Default options for this extension.
 		options: {
 			allowNoSelect: false, //
@@ -11816,8 +12013,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 (function(factory) {
@@ -12017,7 +12214,7 @@ var uniqueId = $.fn.extend( {
 	 */
 	$.ui.fancytree.registerExtension({
 		name: "persist",
-		version: "2.31.0",
+		version: "2.33.0",
 		// Default options for this extension.
 		options: {
 			cookieDelimiter: "~",
@@ -12310,8 +12507,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 (function(factory) {
@@ -12394,7 +12591,7 @@ var uniqueId = $.fn.extend( {

 	$.ui.fancytree.registerExtension({
 		name: "table",
-		version: "2.31.0",
+		version: "2.33.0",
 		// Default options for this extension.
 		options: {
 			checkboxColumnIdx: null, // render the checkboxes into the this column index (default: nodeColumnIdx)
@@ -12860,8 +13057,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 (function(factory) {
@@ -12884,7 +13081,7 @@ var uniqueId = $.fn.extend( {
 	 */
 	$.ui.fancytree.registerExtension({
 		name: "themeroller",
-		version: "2.31.0",
+		version: "2.33.0",
 		// Default options for this extension.
 		options: {
 			activeClass: "ui-state-active", // Class added to active node
@@ -12980,8 +13177,8 @@ var uniqueId = $.fn.extend( {
 * Released under the MIT license
 * https://github.com/mar10/fancytree/wiki/LicenseInfo
 *
- * @version 2.31.0
- * @date 2019-05-31T11:32:38Z
+ * @version 2.33.0
+ * @date 2019-10-29T08:00:07Z
 */

 (function(factory) {
@@ -13111,7 +13308,7 @@ var uniqueId = $.fn.extend( {
 	 */
 	$.ui.fancytree.registerExtension({
 		name: "wide",
-		version: "2.31.0",
+		version: "2.33.0",
 		// Default options for this extension.
 		options: {
 			iconWidth: null, // Adjust this if @fancy-icon-width != "16px"
--- a/Show More
+++ b/Show More