From 3e89855aa38593221201980beb4ef81ed8cd0620 Mon Sep 17 00:00:00 2001
From: Jody <jody@kaplon.us>
Date: Wed, 12 Aug 2020 15:39:12 -0400
Subject: [PATCH 1/2] Add web app manifest (#1174)

* Add web app manifest, link to new manifest on mobile template.

* Remove duplicate manifest entry.
---
 src/public/manifest.webmanifest | 14 ++++++++++++++
 src/views/mobile.ejs            |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 src/public/manifest.webmanifest

diff --git a/src/public/manifest.webmanifest b/src/public/manifest.webmanifest
new file mode 100644
index 000000000..38c009045
--- /dev/null
+++ b/src/public/manifest.webmanifest
@@ -0,0 +1,14 @@
+{
+  "name": "Trilium",
+  "short_name": "Trilium",
+  "theme_color": "DarkGray",
+  "background_color": "DarkGray",
+  "display": "standalone",
+  "scope": "/",
+  "start_url": "/",
+  "icons": [{
+    "src": "images/app-icons/ios/apple-touch-icon.png",
+    "sizes": "180x180",
+    "type": "image/png"
+  }]
+}
diff --git a/src/views/mobile.ejs b/src/views/mobile.ejs
index 74d440fff..2c0ebbeff 100644
--- a/src/views/mobile.ejs
+++ b/src/views/mobile.ejs
@@ -5,7 +5,7 @@
     <link rel="shortcut icon" href="favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <title>Trilium Notes</title>
-    <link rel="apple-touch-icon" sizes="180x180" href="images/app-icons/ios/apple-touch-icon.png">
+    <link rel="manifest" href="manifest.webmanifest">
 
     <style>
         .lds-roller {
@@ -140,4 +140,4 @@
 <link rel="stylesheet" type="text/css" href="libraries/boxicons/css/boxicons.min.css">
 
 </body>
-</html>
\ No newline at end of file
+</html>

From 97109efb6cb8540e02285647943c2ae1b2721cd3 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Wed, 12 Aug 2020 23:59:33 +0200
Subject: [PATCH 2/2] fix attribute cache invalidation

---
 src/public/app/services/load_results.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/public/app/services/load_results.js b/src/public/app/services/load_results.js
index 7153b2e9a..e62ddcd27 100644
--- a/src/public/app/services/load_results.js
+++ b/src/public/app/services/load_results.js
@@ -107,8 +107,8 @@ export default class LoadResults {
      *          notably changes in note itself should not have any effect on attributes
      */
     hasAttributeRelatedChanges() {
-        return this.branches.length === 0
-            && this.attributes.length === 0;
+        return this.branches.length > 0
+            || this.attributes.length > 0;
     }
 
     isEmpty() {