From 8d81522d2ddc7652321c583862d495396d44bb8e Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Sat, 8 Dec 2018 22:33:07 +0100
Subject: Only show loader on initial service load

---
 src/components/services/content/ServiceWebview.js | 2 +-
 src/models/Service.js                             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index b3def3fa5..3ec0c3a67 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -89,7 +89,7 @@ export default @observer class ServiceWebview extends Component {
             reload={reload}
           />
         )}
-        {service.isLoading && (
+        {service.isLoading && service.isFirstLoad && (
           <WebviewLoader
             loaded={!service.isLoading}
             name={service.name}
diff --git a/src/models/Service.js b/src/models/Service.js
index 7ba9aa396..fd867b8a8 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -33,7 +33,7 @@ export default class Service {
   @observable isDarkModeEnabled = false;
   @observable spellcheckerLanguage = null;
 
-  // @observable isFirstNavigation = true;
+  @observable isFirstLoad = true;
   @observable isLoading = true;
   @observable isError = false;
   @observable errorMessage = '';
@@ -163,6 +163,7 @@ export default class Service {
 
     this.webview.addEventListener('did-stop-loading', () => {
       this.isLoading = false;
+      this.isFirstLoad = false;
     });
 
     this.webview.addEventListener('did-fail-load', (event) => {
-- 
cgit v1.2.3-70-g09d2