Ensure pyodide buttons are only added once

holoviz-dev · Sep 9, 2024 · 67c9a8a · 67c9a8a
1 parent 905b9be
commit 67c9a8a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/nbsite/pyodide/ServiceHandler.js b/nbsite/pyodide/ServiceHandler.js
@@ -4,11 +4,11 @@ if ('serviceWorker' in navigator) {
     reg.onupdatefound = () => {
       const installingWorker = reg.installing;
       installingWorker.onstatechange = () => {
-	if (installingWorker.state === 'installed' &&
+        if (installingWorker.state === 'installed' &&
             navigator.serviceWorker.controller) {
-	  // Reload page if service worker is replaced
+          // Reload page if service worker is replaced
           location.reload();
-	}
+        }
       }
     }
   })

diff --git a/nbsite/pyodide/WebWorker.js b/nbsite/pyodide/WebWorker.js
@@ -40,9 +40,9 @@ async function loadApplication(cell_id, path) {
   if (path != null) {
     for (const key of Object.keys(REQUIRES)) {
       if (path.replace('.html', '').endsWith(key.replace('.md', ''))) {
-	for (const req of REQUIRES[key]) {
-	  packages.push(req)
-	}
+        for (const req of REQUIRES[key]) {
+          packages.push(req)
+        }
       }
     }
   }
@@ -169,9 +169,9 @@ self.onmessage = async (event) => {
         id: msg.id
       });
       try {
-	await self.pyodide.runPythonAsync(`await micropip.install('${pkg}', keep_going=True)`)
+        await self.pyodide.runPythonAsync(`await micropip.install('${pkg}', keep_going=True)`)
       } catch(e) {
-	console.log(`Auto-detected dependency ${pkg} could not be installed.`)
+        console.log(`Auto-detected dependency ${pkg} could not be installed.`)
       }
     }
   }

diff --git a/nbsite/pyodide/WorkerHandler.js b/nbsite/pyodide/WorkerHandler.js
@@ -85,7 +85,7 @@ pyodideWorker.onmessage = async (event) => {
       // Setup bi-directional syncing
       pyodideWorker.documents[msg.id] = jsdoc = view.model.document
       if (pyodideWorker.queues != null && pyodideWorker.queues.has(msg.id)) {
-	// Delete old message queue
+        // Delete old message queue
         pyodideWorker.queues.delete(msg.id)
       }
       jsdoc.on_change(send_change.bind(null, jsdoc, msg.id), false)
@@ -102,9 +102,9 @@ pyodideWorker.onmessage = async (event) => {
       pyodideWorker.documents[msg.id].apply_json_patch(msg.patch, msg.buffers, setter_id='py')
     } finally {
       if (patch_status === 0) {
-	patching.delete(msg.id)
+        patching.delete(msg.id)
       } else {
-	patching.set(msg.id, patch_status)
+        patching.set(msg.id, patch_status)
       }
     }
   }

diff --git a/nbsite/pyodide/_static/run_cell.js b/nbsite/pyodide/_static/run_cell.js
@@ -89,8 +89,13 @@ const _query_params = new Proxy(new URLSearchParams(window.location.search), {
 });
 
 let ACCEPTED = false;
+let ADDED = false;
 
 const _addRunButtonToCodeCells = () => {
+  if (ADDED) {
+    return
+  }
+
   // If Pyodide Worker hasn't loaded, wait a bit and try again.
   if (window.pyodideWorker === undefined) {
     setTimeout(addRunButtonToCodeCells, 250)
@@ -126,9 +131,9 @@ const _addRunButtonToCodeCells = () => {
       while (true) {
         let cell_id = _codeCellId(i)
         let cell = document.getElementById(cell_id)
-	if (cell == null) {
-	  break
-	}
+        if (cell == null) {
+          break
+        }
         const output = document.getElementById(`output-${cell_id}`)
         const stdout = document.getElementById(`stdout-${cell_id}`)
         const stderr = document.getElementById(`stderr-${cell_id}`)
@@ -141,13 +146,13 @@ const _addRunButtonToCodeCells = () => {
             stdout.innerHTML = '';
             stdout.style.display = 'none';
           }
-	  if (stderr) {
+          if (stderr) {
             stderr.innerHTML = '';
             stderr.style.display = 'none';
           }
-	  executeCell(cell_id)
+          executeCell(cell_id)
         }
-	i++;
+        i++;
       }
     })
   })
@@ -157,6 +162,7 @@ const _addRunButtonToCodeCells = () => {
     run_button.click()
     run_button.click()
   }
+  ADDED = true
 }
 
 _runWhenDOMLoaded(_addRunButtonToCodeCells)