Merge pull request #158 from codeitcodes/dev

Dev

Author: benhatsor

filebrowser.js

@@ -2744,7 +2744,8 @@ function setupSidebar() {
     renderSidebarHTML();
 
     // if sidebar is open
-    if (getStorage('sidebar') == 'true') {
+    if (getStorage('sidebar') == 'true'
+        && !isEmbed) {
 
       // don't transition
       body.classList.add('notransition');

full.css

@@ -575,7 +575,8 @@ body.scroll-enabled .bookmark {
   left: -1px;
 }
 
-.live-toggle.file-open + .sidebar-toggle {
+.live-toggle.file-open + .sidebar-toggle,
+body.embed .sidebar-toggle {
   display: none;
 }
 

live-view/live-view.js

@@ -64,7 +64,8 @@ async function setupLiveView() {
 
     // if on mobile device
     // and URL has a file
-    if (isMobile && linkData.file) {
+    if ((isMobile && linkData.file)
+        || isEmbed) {
 
       // close sidebar
       toggleSidebar(false);
@@ -1007,6 +1008,8 @@ async function renderLiveViewHTML(file) {
     await workerInstallPromise;
 
   }
+  
+  if (!workerClientId) await workerInstallPromise;
 
 
   liveView.innerHTML = '<iframe src="'+ livePath +'?'+ workerClientId +'/" name="Live view" title="Live view" class="live-frame" allow="accelerometer; camera; encrypted-media; display-capture; geolocation; gyroscope; microphone; midi; clipboard-read; clipboard-write" allowfullscreen="true" allowpaymentrequest="true" loading="lazy" sandbox="allow-downloads allow-forms allow-modals allow-pointer-lock allow-popups allow-presentation allow-same-origin allow-scripts allow-top-navigation-by-user-activation" scrolling="yes" frameborder="0"></iframe>';

utils.js

@@ -193,6 +193,12 @@ if (isMac) {
 
 }
 
+if (isEmbed) {
+  
+  body.classList.add('embed');
+  
+}
+
 window.addEventListener('resize', () => {
 
   isLandscape = window.matchMedia('(orientation: landscape)').matches;

worker/client-channel.js

@@ -197,7 +197,7 @@ function handleFetchRequest(request, event) {
 
     } else if (pathType === 'run'
                || (getPathType(request.referrer) === 'run')) { // if fetch originated in live view
-
+      
       if (enableDevLogs) {
         console.debug('[ServiceWorker] Intercepted live fetch', event);
       }

worker/worker-channel.js

@@ -59,9 +59,9 @@ async function setupWorkerChannel() {
   workerInstallPromise = pingWorkerForClientId();
 
   workerClientId = await workerInstallPromise;
-    
+  
   workerInstallPromise = null;
-    
+  
 
   // create worker channel
   workerChannel = new BroadcastChannel('worker-channel');