aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/components/services/content/ServiceView.js3
-rw-r--r--src/models/Service.js12
2 files changed, 0 insertions, 15 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index b5887eba4..1effcb628 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -113,9 +113,6 @@ class ServiceView extends Component {
113 !service.isServiceAccessRestricted && ( 113 !service.isServiceAccessRestricted && (
114 <WebviewLoader loaded={false} name={service.name} /> 114 <WebviewLoader loaded={false} name={service.name} />
115 )} 115 )}
116 {service.isLoadingPage && !service.isFirstLoad && (
117 <WebviewLoader loaded={false} />
118 )}
119 {service.isError && ( 116 {service.isError && (
120 <WebviewErrorHandler 117 <WebviewErrorHandler
121 name={service.recipe.name} 118 name={service.recipe.name}
diff --git a/src/models/Service.js b/src/models/Service.js
index ae13a063d..e2b9ae7c6 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -74,8 +74,6 @@ export default class Service {
74 74
75 @observable isLoading = true; 75 @observable isLoading = true;
76 76
77 @observable isLoadingPage = true;
78
79 @observable isError = false; 77 @observable isError = false;
80 78
81 @observable errorMessage = ''; 79 @observable errorMessage = '';
@@ -385,20 +383,11 @@ export default class Service {
385 383
386 this.hasCrashed = false; 384 this.hasCrashed = false;
387 this.isLoading = true; 385 this.isLoading = true;
388 this.isLoadingPage = true;
389 this.isError = false; 386 this.isError = false;
390 }); 387 });
391 388
392 this.webview.addEventListener('did-stop-loading', event => {
393 debug('Did stop load', this.name, event);
394
395 this.isLoading = false;
396 this.isLoadingPage = false;
397 });
398
399 const didLoad = () => { 389 const didLoad = () => {
400 this.isLoading = false; 390 this.isLoading = false;
401 this.isLoadingPage = false;
402 391
403 if (!this.isError) { 392 if (!this.isError) {
404 this.isFirstLoad = false; 393 this.isFirstLoad = false;
@@ -418,7 +407,6 @@ export default class Service {
418 this.isError = true; 407 this.isError = true;
419 this.errorMessage = event.errorDescription; 408 this.errorMessage = event.errorDescription;
420 this.isLoading = false; 409 this.isLoading = false;
421 this.isLoadingPage = false;
422 } 410 }
423 }); 411 });
424 412