From 6ebb0ef39474ffa46a789d48fd0c89d503c34ac9 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Wed, 14 Feb 2018 18:23:11 -0800
Subject: [PATCH] simplify loading mask impl

---
 routes/_components/LoadingMask.html | 20 ++++++++++----------
 routes/settings/instances/add.html  |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/routes/_components/LoadingMask.html b/routes/_components/LoadingMask.html
index 745d5a46..d04ca6ff 100644
--- a/routes/_components/LoadingMask.html
+++ b/routes/_components/LoadingMask.html
@@ -1,9 +1,7 @@
-<div class="loading-container">
-  {{#if show}}
-  <div transition:fade class="loading-mask">
+<div class="loading-container {{shown ? 'loading-container-shown' : ''}}">
+  <div class="loading-mask">
     <LoadingSpinner maskStyle="true"/>
   </div>
-  {{/if}}
 </div>
 <style>
   .loading-container {
@@ -12,8 +10,11 @@
     top: 0;
     bottom: 0;
     position: fixed;
-    pointer-events: none;
     z-index: 100;
+    pointer-events: none;
+  }
+  .loading-container.loading-container-shown {
+    pointer-events: auto;
   }
   .loading-mask {
     width: 100%;
@@ -22,18 +23,17 @@
     align-items: center;
     justify-content: center;
     background: var(--mask-bg);
+    opacity: 0;
+    transition: opacity 333ms linear;
+  }
+  .loading-container-shown .loading-mask {
     opacity: 0.6;
-    pointer-events: auto;
   }
 </style>
 <script>
-  import { fade } from 'svelte-transitions'
   import LoadingSpinner from './LoadingSpinner.html'
 
   export default {
-    transitions: {
-      fade
-    },
     components: {
       LoadingSpinner
     }
diff --git a/routes/settings/instances/add.html b/routes/settings/instances/add.html
index b135b339..aceea0ed 100644
--- a/routes/settings/instances/add.html
+++ b/routes/settings/instances/add.html
@@ -6,7 +6,7 @@
   <SettingsLayout page='settings/instances/add' label="Add an Instance">
     <h1 id="add-an-instance-h1">Add an Instance</h1>
 
-    <LoadingMask show="{{$logInToInstanceLoading}}"/>
+    <LoadingMask shown="{{$logInToInstanceLoading}}"/>
 
     {{#if $isUserLoggedIn}}
     <p>Connect to an instance to log in.</p>