Disable dialog for purge caches & Re-order buttons

Signed-off-by: Florian Hotze <[email protected]>
openhab · Aug 27, 2023 · 013b23f · 013b23f
1 parent 54e5372
commit 013b23f
Showing 1 changed file with 25 additions and 30 deletions.
diff --git a/bundles/org.openhab.ui/web/src/components/app.vue b/bundles/org.openhab.ui/web/src/components/app.vue
@@ -144,12 +144,12 @@
         <f7-list-button color="blue" @click="loadData">
           {{ $t('dialogs.retry') }}
         </f7-list-button>
-        <f7-list-button color="red" @click="purgeServiceWorkerAndCaches">
-          {{ $t('about.reload.purgeCachesAndRefresh') }}
-        </f7-list-button>
         <f7-list-button color="blue" @click="reload">
           {{ $t('about.reload.reloadApp') }}
         </f7-list-button>
+        <f7-list-button color="red" @click="purgeServiceWorkerAndCaches">
+          {{ $t('about.reload.purgeCachesAndRefresh') }}
+        </f7-list-button>
       </f7-list>
     </f7-block>
 
@@ -712,35 +712,30 @@ export default {
       return toast
     },
     purgeServiceWorkerAndCaches () {
-      this.$f7.dialog.confirm(
-        this.$t('about.reload.confirmPurge'),
-        () => {
-          navigator.serviceWorker.getRegistrations().then(function (registrations) {
-            for (let registration of registrations) {
-              registration.unregister().then(function () {
-                return self.clients.matchAll()
-              }).then(function (clients) {
-                clients.forEach(client => {
-                  if (client.url && 'navigate' in client) {
-                    setTimeout(() => { client.navigate(client.url.split('#')[0]) }, 1000)
-                  }
-                })
-              })
-            }
-          })
-          window.caches.keys().then(function (cachesNames) {
-            console.log('Deleting caches')
-            return Promise.all(cachesNames.map(function (cacheName) {
-              return caches.delete(cacheName).then(function () {
-                console.log('Cache with name ' + cacheName + ' is deleted')
-              })
-            }))
-          }).then(function () {
-            console.log('Caches deleted')
-            setTimeout(() => { location.reload(true) }, 1000)
+      navigator.serviceWorker.getRegistrations().then(function (registrations) {
+        for (let registration of registrations) {
+          registration.unregister().then(function () {
+            return self.clients.matchAll()
+          }).then(function (clients) {
+            clients.forEach(client => {
+              if (client.url && 'navigate' in client) {
+                setTimeout(() => { client.navigate(client.url.split('#')[0]) }, 1000)
+              }
+            })
           })
         }
-      )
+      })
+      window.caches.keys().then(function (cachesNames) {
+        console.log('Deleting caches')
+        return Promise.all(cachesNames.map(function (cacheName) {
+          return caches.delete(cacheName).then(function () {
+            console.log('Cache with name ' + cacheName + ' is deleted')
+          })
+        }))
+      }).then(function () {
+        console.log('Caches deleted')
+        setTimeout(() => { location.reload(true) }, 1000)
+      })
     },
     reload () {
       document.location.reload()