Merge branch 'template'

somiibo · Feb 6, 2025 · 943d2e5 · 943d2e5
2 parents a381049 + 9c1105a
commit 943d2e5
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 15 deletions.
diff --git a/_layouts/master/authentication/account.html b/_layouts/master/authentication/account.html
@@ -1876,11 +1876,16 @@ <h4 class="mb-0">{name} <span class="connect-account-identity text-muted" data-p
           $personalInformationSavePopup.removeAttribute('hidden')
         })
 
-        new bootstrap.ScrollSpy(document.body, {
-          target: '#navbarSettings',
-          offset: 100,
-          // offset: 0,
-        })
+        // TODO: REMOVE TRY/CATCH WHEN CDN.ITWCREATIVEWORKS.COM IS FIXED
+        try {
+          new bootstrap.ScrollSpy(document.body, {
+            target: '#navbarSettings',
+            offset: 100,
+            // offset: 0,
+          })
+        } catch (e) {
+          console.error('ScrollSpy', e);
+        }
 
         new HSScrollspy('#navbarVerticalNavMenu', {
           breakpoint: 'lg',
@@ -1894,10 +1899,15 @@ <h4 class="mb-0">{name} <span class="connect-account-identity text-muted" data-p
 
         // accountResultEl.setInnerHTML(JSON.stringify(accountData, null, 2));
 
-        var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
-        var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
-          return bootstrap.Tooltip.getOrCreateInstance(tooltipTriggerEl)
-        })
+        // TODO: REMOVE TRY/CATCH WHEN CDN.ITWCREATIVEWORKS.COM IS FIXED
+        try {
+          var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
+          var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
+            return bootstrap.Tooltip.getOrCreateInstance(tooltipTriggerEl)
+          })
+        } catch (e) {
+          console.error('Tooltip', e);
+        }
 
         // Handle hash
         var $hashBtn = document.querySelector('*[href="' + currentURL.hash + '"]');
@@ -2041,10 +2051,18 @@ <h4 class="mb-0">{name} <span class="connect-account-identity text-muted" data-p
     function toast(type, message) {
       var $el = document.getElementById('toast-main');
       $el.classList.remove('bg-primary', 'bg-danger', 'bg-success');
-      var $toast = bootstrap.Toast.getOrCreateInstance($el, {
-        delay: 5000,
-        autohide: false,
-      })
+      var $toast;
+
+      // TODO: REMOVE TRY/CATCH WHEN CDN.ITWCREATIVEWORKS.COM IS FIXED
+      try {
+        $toast = bootstrap.Toast.getOrCreateInstance($el, {
+          delay: 5000,
+          autohide: false,
+        })
+      } catch (e) {
+        console.error('Toast', e);
+      }
+
       var $body = $el.querySelector('.toast-body')
 
       $toast.hide();

diff --git a/_layouts/master/authentication/main.html b/_layouts/master/authentication/main.html
@@ -490,7 +490,12 @@ <h5 class="modal-title" id="exampleModalLabel">Oops!</h5>
     redirectUrl = qsDestination || url.origin;
     serverApiURL = serverApiURL.replace(/PROJECT_ID/g, Manager.properties.options.libraries.firebase_app.config.projectId)
 
-    $authErrorModal = new bootstrap.Modal(document.getElementById('auth-error-modal'), {})
+    // TODO: REMOVE TRY/CATCH WHEN CDN.ITWCREATIVEWORKS.COM IS WORKING
+    try {
+      $authErrorModal = new bootstrap.Modal(document.getElementById('auth-error-modal'), {})
+    } catch (e) {
+      console.error('main(): Error creating modal', e);
+    }
     $authErrorModalMessage = document.getElementById('auth-error-modal-message');
     $authLinks = select('a[href*="/signin"], a[href*="/signup"]');
     $emailInput = select('.auth-email-input');
@@ -1005,7 +1010,12 @@ <h5 class="modal-title" id="exampleModalLabel">Oops!</h5>
 
     console.log('display():', type, msg, providerDetails)
 
-    $authErrorModal.hide();
+    // TODO: REMOVE TRY/CATCH WHEN CDN.ITWCREATIVEWORKS.COM IS WORKING
+    try {
+      $authErrorModal.hide();
+    } catch (e) {
+      console.error('display(): Error hiding modal', e);
+    }
 
     alertEl
       .setAttribute('hidden', true)