Update interface.js

interface.js

@@ -1,9 +1,13 @@
 // interface.js
+// ==============================
 
+// Store a reference to the <script> tag that loaded this file
 const currentScriptTag = document.currentScript;
 
 (async function() {
-  // 1. Locate script tag and read data-config
+  alert("[interface.js] SCRIPT BEGIN");
+
+  // 1. Locate the <script> and read data-config
   let scriptTag = currentScriptTag;
   if (!scriptTag) {
     const scripts = document.getElementsByTagName('script');
@@ -24,31 +28,43 @@ const currentScriptTag = document.currentScript;
     try {
       const response = await fetch(configUrl);
       config = await response.json();
-    } catch (error) { return; }
+      alert("[interface.js] Config loaded successfully");
+    } catch (error) {
+      alert("[interface.js] ERROR: Config failed to load: " + error);
+      return;
+    }
   } else {
+    alert("[interface.js] ERROR: No config file provided.");
     return;
   }
 
-  // 2. CSS injection
+  // 2. If config.css_url is provided, inject a <link> to that CSS
   if (config.css_url) {
     const linkEl = document.createElement('link');
     linkEl.rel = "stylesheet";
     linkEl.href = config.css_url;
     document.head.appendChild(linkEl);
+    alert("[interface.js] CSS injected");
   }
 
-  // 3. Unique instanceId
+  // 3. Generate a unique instanceId for this widget
   const instanceId = Math.random().toString(36).substr(2, 8);
 
-  // 4. Aspect ratio calc
+  // 4. Compute the aspect ratio (padding-bottom %)
   let aspectPercent = "100%";
   if (config.aspect) {
     if (config.aspect.includes(":")) {
-      const [w, h] = config.aspect.split(":").map(Number);
-      if (w > 0 && h > 0) aspectPercent = (h / w * 100) + "%";
+      const parts = config.aspect.split(":");
+      const w = parseFloat(parts[0]);
+      const h = parseFloat(parts[1]);
+      if (!isNaN(w) && !isNaN(h) && w > 0) {
+        aspectPercent = (h / w * 100) + "%";
+      }
     } else {
       const aspectValue = parseFloat(config.aspect);
-      if (!isNaN(aspectValue) && aspectValue > 0) aspectPercent = (100 / aspectValue) + "%";
+      if (!isNaN(aspectValue) && aspectValue > 0) {
+        aspectPercent = (100 / aspectValue) + "%";
+      }
     }
   } else {
     const parentContainer = scriptTag.parentNode;
@@ -59,7 +75,7 @@ const currentScriptTag = document.currentScript;
     }
   }
 
-  // 5. Widget container
+  // 5. Create the widget container (no GIF preview, no close button)
   const widgetContainer = document.createElement('div');
   widgetContainer.id = 'ply-widget-container-' + instanceId;
   widgetContainer.classList.add('ply-widget-container');
@@ -67,51 +83,42 @@ const currentScriptTag = document.currentScript;
   widgetContainer.style.paddingBottom = aspectPercent;
   widgetContainer.setAttribute('data-original-aspect', aspectPercent);
 
-  // 5a. Ensure touch-action disables iOS Safari pinch/zoom/scroll on viewer
-  widgetContainer.style.touchAction = 'none';
-
-  // 5b. Set iOS meta viewport to prevent zoom
-  if (!document.querySelector('meta[name="viewport"]')) {
-    const meta = document.createElement('meta');
-    meta.name = "viewport";
-    meta.content = "width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0";
-    document.head.appendChild(meta);
-  }
-
-  // Tooltips toggle button (if configured)
+  // Conditionally include the “tooltips-toggle” button only if config.tooltips_url is defined
   const tooltipsButtonHTML = config.tooltips_url
-    ? `<button id="tooltips-toggle-${instanceId}" class="widget-button tooltips-toggle" tabindex="0" aria-label="Afficher/masquer tooltips">⦿</button>`
+    ? `<button id="tooltips-toggle-${instanceId}" class="widget-button tooltips-toggle">⦿</button>`
     : '';
 
-  // Viewer HTML
+  // Add the 3D-viewer HTML + tooltip + help HTML (all HTML in a template literal!)
   widgetContainer.innerHTML = `
     <div id="viewer-container-${instanceId}" class="viewer-container">
       <div id="progress-dialog-${instanceId}" class="progress-dialog">
         <progress id="progress-indicator-${instanceId}" max="100" value="0"></progress>
       </div>
-      <button id="fullscreen-toggle-${instanceId}" class="widget-button fullscreen-toggle" tabindex="0" aria-label="Plein écran">⇱</button>
-      <button id="help-toggle-${instanceId}" class="widget-button help-toggle" tabindex="0" aria-label="Aide">?</button>
-      <button id="reset-camera-btn-${instanceId}" class="widget-button reset-camera-btn" tabindex="0" aria-label="Réinitialiser caméra">
+      <button id="fullscreen-toggle-${instanceId}" class="widget-button fullscreen-toggle">⇱</button>
+      <button id="help-toggle-${instanceId}" class="widget-button help-toggle">?</button>
+      <button id="reset-camera-btn-${instanceId}" class="widget-button reset-camera-btn">
         <span class="reset-icon">⟲</span>
       </button>
       ${tooltipsButtonHTML}
       <div id="menu-content-${instanceId}" class="menu-content">
-        <span id="help-close-${instanceId}" class="help-close" tabindex="0" aria-label="Fermer">×</span>
+        <span id="help-close-${instanceId}" class="help-close">×</span>
         <div class="help-text"></div>
       </div>
     </div>
     <div id="tooltip-panel" class="tooltip-panel" style="display: none;">
       <div class="tooltip-content">
-        <span id="tooltip-close" class="tooltip-close" tabindex="0" aria-label="Fermer">×</span>
+        <span id="tooltip-close" class="tooltip-close">×</span>
         <div id="tooltip-text" class="tooltip-text"></div>
         <img id="tooltip-image" class="tooltip-image" src="" alt="" style="display: none;" />
       </div>
     </div>
   `;
 
+  // Append the widget container immediately after the <script> tag
   scriptTag.parentNode.appendChild(widgetContainer);
+  alert("[interface.js] Widget HTML injected");
 
-  // 6. DOM references
+  // 6. Grab references to new DOM elements
   const viewerContainerElem = document.getElementById('viewer-container-' + instanceId);
   const fullscreenToggle    = document.getElementById('fullscreen-toggle-' + instanceId);
   const helpToggle          = document.getElementById('help-toggle-' + instanceId);
@@ -120,27 +127,49 @@ const currentScriptTag = document.currentScript;
   const tooltipsToggleBtn   = document.getElementById('tooltips-toggle-' + instanceId);
   const menuContent         = document.getElementById('menu-content-' + instanceId);
   const helpTextDiv         = menuContent.querySelector('.help-text');
-  const tooltipPanel        = document.getElementById('tooltip-panel');
-  const tooltipTextDiv      = document.getElementById('tooltip-text');
-  const tooltipImage        = document.getElementById('tooltip-image');
-  const tooltipCloseBtn     = document.getElementById('tooltip-close');
 
-  // Platform detection
+  // Tooltip panel elements
+  const tooltipPanel       = document.getElementById('tooltip-panel');
+  const tooltipTextDiv     = document.getElementById('tooltip-text');
+  const tooltipImage       = document.getElementById('tooltip-image');
+  const tooltipCloseBtn    = document.getElementById('tooltip-close');
+
+  // 6a. Detect mobile vs. desktop
   const isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
-  // Help text
+  // Conditionally include the French tooltip instruction line if tooltips_url exists
   const tooltipInstruction = config.tooltips_url
     ? '- Cliquez sur ⦿ pour afficher/masquer les tooltips.<br>'
     : '';
-  helpTextDiv.innerHTML = isMobile
-    ? '- Pour vous déplacer, glissez deux doigts sur l\'écran.<br>- Pour orbiter, utilisez un doigt.<br>- Pour zoomer, pincez avec deux doigts.<br>' + tooltipInstruction + '- ⟲ Réinitialise la caméra.<br>- ⇱ Passe en plein écran.<br>'
-    : '- orbitez avec le clic droit<br>- zoomez avec la molette<br>- déplacez vous avec le clic gauche<br>' + tooltipInstruction + '- ⟲ Réinitialise la caméra.<br>- ⇱ Passe en plein écran.<br>';
+
+  // Fill help text with instructions plus the two new French lines
+  if (isMobile) {
+    helpTextDiv.innerHTML = 
+      '- Pour vous déplacer, glissez deux doigts sur l\'écran.<br>' +
+      '- Pour orbiter, utilisez un doigt.<br>' +
+      '- Pour zoomer, pincez avec deux doigts.<br>' +
+      tooltipInstruction +
+      '- ⟲ Réinitialise la caméra.<br>' +
+      '- ⇱ Passe en plein écran.<br>';
+  } else {
+    helpTextDiv.innerHTML = 
+      '- orbitez avec le clic droit<br>' +
+      '- zoomez avec la molette<br>' +
+      '- déplacez vous avec le clic gauche<br>' +
+      tooltipInstruction +
+      '- ⟲ Réinitialise la caméra.<br>' +
+      '- ⇱ Passe en plein écran.<br>';
+  }
+
+  // Ensure instructions panel is visible by default
   menuContent.style.display = 'block';
   viewerContainerElem.style.display = 'block';
 
+  // Variable to hold the drag-hide listener reference
   let dragHide = null;
 
+  // Utilities to hide panels
   function hideTooltipPanel() {
     if (dragHide) {
       viewerContainerElem.removeEventListener('pointermove', dragHide);
@@ -148,29 +177,26 @@ const currentScriptTag = document.currentScript;
     }
     tooltipPanel.style.display = 'none';
   }
-  function hideHelpPanel() { menuContent.style.display = 'none'; }
+  function hideHelpPanel() {
+    menuContent.style.display = 'none';
+  }
 
-  // 7. Load viewer.js
+  // 7. Dynamically load viewer.js
   let viewerModule;
   try {
     viewerModule = await import('https://mikafil-viewer-gs.static.hf.space/viewer.js');
+    alert("[interface.js] viewer.js module loaded");
     await viewerModule.initializeViewer(config, instanceId);
-  } catch (err) { return; }
+    alert("[interface.js] viewer.js initializeViewer() returned");
+  } catch (err) {
+    alert("[interface.js] ERROR: Failed to load or init viewer.js: " + err);
+    return;
+  }
 
   const canvasId = 'canvas-' + instanceId;
   const canvasEl = document.getElementById(canvasId);
 
-  // 7b. Fix for iOS: always use correct canvas style and prevent double-scaling
-  if (canvasEl) {
-    canvasEl.style.touchAction = 'none';
-    canvasEl.style.width = '100%';
-    canvasEl.style.height = '100%';
-    canvasEl.style.display = 'block';
-    // Remove any tab focus from canvas to prevent scroll-zoom
-    canvasEl.setAttribute('tabindex', '-1');
-  }
-
-  // 8. Tooltips button conditional display
+  // 8. Conditional display of tooltips-toggle button
   if (tooltipsToggleBtn) {
     if (!config.tooltips_url) {
       tooltipsToggleBtn.style.display = 'none';
@@ -181,9 +207,10 @@ const currentScriptTag = document.currentScript;
     }
   }
 
-  // 9. Fullscreen/state logic
+  // 9. Fullscreen / state-preservation logic
   let isFullscreen = false;
   let savedState = null;
+
   function saveCurrentState() {
     if (isFullscreen) return;
     const originalAspect = widgetContainer.getAttribute('data-original-aspect') || aspectPercent;
@@ -205,6 +232,7 @@ const currentScriptTag = document.currentScript;
       }
     };
   }
+
   function restoreOriginalStyles() {
     if (!savedState) return;
     const aspectToUse = savedState.widget.paddingBottom;
@@ -235,8 +263,10 @@ const currentScriptTag = document.currentScript;
         viewerContainerElem.clientHeight
       );
     }
+
     savedState = null;
   }
+
   function applyFullscreenStyles() {
     widgetContainer.style.position      = 'fixed';
     widgetContainer.style.top           = '0';
@@ -262,7 +292,9 @@ const currentScriptTag = document.currentScript;
     fullscreenToggle.textContent = '⇲';
     isFullscreen = true;
   }
+
   function enterFullscreen() {
+    alert("[interface.js] Entering fullscreen");
     if (!savedState) saveCurrentState();
     if (isIOS) {
       applyFullscreenStyles();
@@ -279,7 +311,9 @@ const currentScriptTag = document.currentScript;
       widgetContainer.classList.add('fake-fullscreen');
     }
   }
+
   function exitFullscreen() {
+    alert("[interface.js] Exiting fullscreen");
     if (document.fullscreenElement === widgetContainer && document.exitFullscreen) {
       document.exitFullscreen().catch(() => {});
     }
@@ -288,7 +322,7 @@ const currentScriptTag = document.currentScript;
     isFullscreen = false;
   }
 
-  // 10. Event listeners
+  // 10. Hook up event listeners
   fullscreenToggle.addEventListener('click', () => {
     hideTooltipPanel();
     isFullscreen ? exitFullscreen() : enterFullscreen();
@@ -309,6 +343,7 @@ const currentScriptTag = document.currentScript;
 
   resetCameraBtn.addEventListener('click', () => {
     hideTooltipPanel();
+    alert("[interface.js] Reset camera button clicked");
     if (viewerModule.resetViewerCamera) {
       viewerModule.resetViewerCamera();
     }
@@ -321,9 +356,11 @@ const currentScriptTag = document.currentScript;
       hideTooltipPanel();
       tooltipsVisible = !tooltipsVisible;
       tooltipsToggleBtn.style.opacity = tooltipsVisible ? '1' : '0.5';
+      alert("[interface.js] Tooltips toggle clicked. Now: " + (tooltipsVisible ? "ON" : "OFF"));
       document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: tooltipsVisible } }));
     });
   }
+
   tooltipCloseBtn.addEventListener('click', hideTooltipPanel);
 
   document.addEventListener('tooltip-selected', (evt) => {
@@ -346,13 +383,6 @@ const currentScriptTag = document.currentScript;
 
   if (canvasEl) {
     canvasEl.addEventListener('wheel', hideTooltipPanel, { passive: true });
-
-    // iOS pinch zoom prevention
-    canvasEl.addEventListener('touchmove', function(e) {
-      if (e.touches.length > 1) {
-        e.preventDefault();
-      }
-    }, { passive: false });
   }
   document.addEventListener('keydown', (e) => {
     if ((e.key === 'Escape' || e.key === 'Esc') && isFullscreen) exitFullscreen();
@@ -370,45 +400,10 @@ const currentScriptTag = document.currentScript;
     }
   });
 
-  // iOS: unlock WebGL/audio on first user gesture (if needed)
-  if (isIOS && canvasEl) {
-    let firstUserAction = false;
-    function unlockWebGLAndAudio() {
-      if (!firstUserAction) {
-        if (viewerModule.app && viewerModule.app.graphicsDevice && viewerModule.app.graphicsDevice.canvas) {
-          // iOS hack: force focus and dummy audio play
-          viewerModule.app.graphicsDevice.canvas.focus && viewerModule.app.graphicsDevice.canvas.focus();
-          try {
-            const ctx = new AudioContext();
-            const buffer = ctx.createBuffer(1, 1, 22050);
-            const src = ctx.createBufferSource();
-            src.buffer = buffer;
-            src.connect(ctx.destination);
-            src.start(0);
-          } catch {}
-        }
-        firstUserAction = true;
-      }
-    }
-    canvasEl.addEventListener('touchstart', unlockWebGLAndAudio, { once: true });
-    canvasEl.addEventListener('mousedown', unlockWebGLAndAudio, { once: true });
-  }
-
   setTimeout(() => {
     saveCurrentState();
     document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: !!config.showTooltipsDefault } }));
+    alert("[interface.js] Widget setup complete!");
   }, 200);
 
-  // Ensure ResizeObserver always triggers a correct canvas resize (iOS)
-  if (canvasEl && window.ResizeObserver) {
-    const resizeObs = new ResizeObserver(() => {
-      if (viewerModule.app) {
-        viewerModule.app.resizeCanvas(
-          viewerContainerElem.clientWidth,
-          viewerContainerElem.clientHeight
-        );
-      }
-    });
-    resizeObs.observe(viewerContainerElem);
-  }
 })();