@jscad/web 2.6.11 → 2.6.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/web",
-  "version": "2.6.11",
+  "version": "2.6.13",
   "description": "Web Application for JSCAD",
   "homepage": "https://openjscad.xyz/",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
@@ -9,7 +9,7 @@
   "scripts": {
     "build": "browserify src/index.js -o dist/jscad-web.min.js -g uglifyify --standalone jscadWeb",
     "dev": "budo demo.js --port=8081 --css ./css/demo.css --live -- -b",
-    "postinstall": "node postInstall.js && node -e \"console.log('\\u001b[35m\\u001b[1mLove JSCAD? You can now donate to our open collective:\\u001b[22m\\u001b[39m\\n > \\u001b[34mhttps://opencollective.com/openjscad/donate\\u001b[0m')\"",
+    "postinstall": "node postInstall.js",
     "test": "ava 'src/**/*.test.js' --verbose --timeout 2m",
     "version": "npm run build && git add dist"
   },
@@ -36,11 +36,11 @@
   "license": "MIT",
   "dependencies": {
     "@jscad/array-utils": "2.1.4",
-    "@jscad/core": "2.6.13",
+    "@jscad/core": "2.6.15",
     "@jscad/examples": "2.4.2",
-    "@jscad/io": "2.4.12",
-    "@jscad/modeling": "2.12.6",
-    "@jscad/regl-renderer": "2.6.13",
+    "@jscad/io": "2.4.14",
+    "@jscad/modeling": "2.13.0",
+    "@jscad/regl-renderer": "2.6.15",
     "@most/create": "2.0.1",
     "brace": "0.11.1",
     "codemirror": "5.65.2",
@@ -67,5 +67,5 @@
     "url": "https://opencollective.com/openjscad",
     "logo": "https://opencollective.com/openjscad/logo.txt"
   },
-  "gitHead": "11a9a2d9235d804360116f776076c9f3237a3eb0"
+  "gitHead": "602bb2a3a2c2c7c21315e2801804dd1ec0cbd3f8"
 }

package/postInstall.js

@@ -1,6 +1,6 @@
 // this copies the examples folder from the @jscad/examples repository locally
 const path = require('path')
-const examplesSrc = path.resolve('./node_modules/@jscad/examples')
+const examplesSrc = path.resolve('../examples')
 const copydir = require('copy-dir')
 const fs = require('fs')
 const DocBlock = require('docblock')

package/remote.pl

@@ -19,7 +19,7 @@ my $q = new CGI;
 my $maxSize = 10_000_000;     # [bytes], max size of file
 my $maxTime = 60;             # [s], max download time
 
-cacheLocal($q->param('url'));
+cacheLocal(scalar $q->param('url'));
 
 opendir(D,$dir);
 foreach(readdir(D)) {

package/src/index.js

@@ -110,8 +110,13 @@ const makeJscad = async (targetElement, options) => {
   // increase the count of jscad instances in this page
   instances += 1
 
-  setTimeout(() => { document.getElementById('toggleAxes').click() }, 100)
-  setTimeout(() => { document.getElementById('toggleAxes').click() }, 200)
+  // See ui/flow/viewer.js for the initial states
+  //setTimeout(() => { document.getElementById('toggleAxes').click() }, 100)
+  //setTimeout(() => { document.getElementById('toggleGrid').click() }, 200)
+  //setTimeout(() => { document.getElementById('toggleAutoZoom').click() }, 200)
+
+  // click on an example for the initial view
+  setTimeout(() => { document.getElementById('example1-1').click() }, 200)
 
   // we return a function to allow setting/modifying params
   const mainParams = callbackToObservable()

package/src/most-gestures/gestures.test.js

@@ -272,7 +272,7 @@ test.cb('zooms (from mousewheel event) direct element', (t) => {
     })
 })
 
-test.cb('zooms (from pinch)', (t) => {
+test.skip('zooms (from pinch)', (t) => {
   const zooms = pointerGestures(t.context.baseStreams).zooms
 
   const div = t.context.div
@@ -296,7 +296,7 @@ test.cb('zooms (from pinch)', (t) => {
     })
 })
 
-test.cb('zooms (from pinch) direct element', (t) => {
+test.skip('zooms (from pinch) direct element', (t) => {
   const div = t.context.div
   const zooms = pointerGestures(div).zooms
 

package/src/ui/flow/viewer.js

@@ -9,10 +9,10 @@ const reducers = {
         background: [1, 1, 1, 1],
         meshColor: [0, 0.6, 1, 1],
         autoRotate: false,
-        autoZoom: false
+        autoZoom: true
       },
       grid: {
-        show: false,
+        show: true,
         color: [1, 1, 1, 0.1]
       },
       axes: {

package/src/ui/views/examples.js

@@ -6,17 +6,21 @@ const examplesData = require('../../../examples/examples.json')
 const examples = (state, i18n) => {
   const baseUrl = new URL(window.location.href)
   const origin = (baseUrl.origin === 'null') ? 'file://' : baseUrl.origin
-  let newPath = origin + path.dirname(baseUrl.pathname)
-  newPath = newPath.endsWith('/') ? newPath : newPath + path.sep
+  let newPath = origin + baseUrl.pathname
+  newPath = newPath.endsWith(path.sep) ? newPath : newPath + path.sep
 
   const examplesMenus = []
+  let groupId = 0
   for (const groupName in examplesData) {
+    groupId++
     if (!Object.prototype.hasOwnProperty.call(examplesData, groupName)) continue
-    const examplesElements = examplesData[groupName].map((example) =>
-      html`<li>
-          <a class="example" title="${example.description}" data-path="${newPath}${example.filePath}" href="#"> ${example.title} </a>
+
+    const examplesElements = examplesData[groupName].map((example, i) => {
+      const id = `example${groupId}-${i}`
+      return html`<li>
+          <a class="example" id="${id}" title="${example.description}" data-path="${newPath}${example.filePath}" href="#"> ${example.title} </a>
         </li>`
-    )
+    })
     examplesMenus.push(html`<li>${groupName}<ul class="examples-list">${examplesElements}</ul></li>`)
   }
   return html`<ul class="examples-group">${examplesMenus}</ul>`