sunrize 1.3.4 → 1.3.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -14,12 +14,14 @@
   "scripts": {
     "start": "electron .",
     "development": "SUNRISE_ENVIRONMENT=DEVELOPMENT electron .",
-    "package": "node build/package.js",
-    "premake": "npm i -D electron",
-    "make": "electron-forge make",
-    "postmake": "npm i -P electron",
     "release": "node build/release.js",
     "download": "node build/download.js",
+    "premake": "npm i -D electron",
+    "make": "env PATH=\"$(pwd)/build/wine-proxy:$PATH\" electron-forge make",
+    "postmake": "npm i -P electron",
+    "pregithub": "npm i -D electron",
+    "github": "env PATH=\"$(pwd)/build/wine-proxy:$PATH\" electron-forge publish",
+    "postgithub": "npm i -P electron",
     "predocs": "rm -f -r docs/_site/",
     "docs": "cd docs && bundle exec jekyll serve --incremental --host=`ipconfig getifaddr en0`",
     "docs-install": "cd docs && bundle install",
@@ -68,15 +70,17 @@
   "devDependencies": {
     "@electron-forge/cli": "^7.2.0",
     "@electron-forge/maker-deb": "^7.2.0",
+    "@electron-forge/maker-dmg": "^7.2.0",
     "@electron-forge/maker-rpm": "^7.2.0",
     "@electron-forge/maker-squirrel": "^7.2.0",
     "@electron-forge/maker-zip": "^7.2.0",
+    "@electron-forge/publisher-github": "^7.2.0",
     "shell-tools": "^1.1.7"
   },
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^28.0.0",
+    "electron": "^28.1.0",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.0",
     "electron-tabs": "^1.0.2",
@@ -93,34 +97,45 @@
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
-    "x_ite": "^9.1.10"
+    "update-electron-app": "^3.0.0",
+    "x_ite": "^9.1.11"
   },
   "config": {
     "forge": {
       "packagerConfig": {
         "icon": "./src/assets/images/icon.png",
-        "extendInfo": "./src/assets/Info.plist"
+        "dir": "./src",
+        "ignore": "^/(?!src|package\\.json|node_modules)",
+        "certificateFile": "./build/certificate.pfx",
+        "certificatePassword": "CREATE3000",
+        "extendInfo": "./src/assets/Info.plist",
+        "osxSign": {}
       },
       "makers": [
         {
-          "name": "@electron-forge/maker-squirrel",
-          "config": {
-            "name": "Sunrize"
-          }
+          "name": "@electron-forge/maker-squirrel"
         },
         {
-          "name": "@electron-forge/maker-zip",
-          "platforms": [
-            "darwin"
-          ]
+          "name": "@electron-forge/maker-dmg"
         },
         {
-          "name": "@electron-forge/maker-deb",
-          "config": {}
+          "name": "@electron-forge/maker-deb"
         },
         {
-          "name": "@electron-forge/maker-rpm",
-          "config": {}
+          "name": "@electron-forge/maker-rpm"
+        }
+      ],
+      "publishers": [
+        {
+          "name": "@electron-forge/publisher-github",
+          "config": {
+            "repository": {
+              "owner": "create3000",
+              "name": "sunrize"
+            },
+            "prerelease": false,
+            "draft": false
+          }
         }
       ]
     }

package/src/Application/Application.js

@@ -13,8 +13,6 @@ const
    DataStorage  = require ("../Application/DataStorage"),
    _            = require ("../Application/GetText");
 
-// Use electron@15.3
-
 const localStorage = new LocalStorage (path .join (electron .app .getPath ("userData"), "Global Storage"));
 
 module .exports = class Application
@@ -27,10 +25,22 @@ module .exports = class Application
 
    static run ()
    {
-      if (electron .app .requestSingleInstanceLock ())
-         new this ();
-      else
+      if (require ("electron-squirrel-startup"))
+      {
+         electron .app .quit ();
+         return;
+      }
+
+      if (!electron .app .requestSingleInstanceLock ())
+      {
          electron .app .quit ();
+         return;
+      }
+
+      if (process .platform === "win32")
+         require ("update-electron-app") .updateElectronApp ();
+
+      new Application ();
    }
 
    constructor ()
@@ -90,6 +100,7 @@ module .exports = class Application
       await this .createWindow ();
 
       this .openFiles (process .argv .slice (electron .app .isPackaged ? 1 : 2)
+         .filter (filePath => fs .existsSync (filePath) && fs .lstatSync (filePath) .isFile ())
          .map (filePath => url .pathToFileURL (filePath) .href));
 
       this .openFiles (this .receivedFiles);
@@ -632,9 +643,9 @@ module .exports = class Application
             submenu: [
                {
                   label: "Learn More",
-                  click: async () =>
+                  click: () =>
                   {
-                     await electron .shell .openExternal ("https://create3000.github.io/x_ite/");
+                     electron .shell .openExternal ("https://create3000.github.io/x_ite/");
                   },
                },
             ],

package/src/Controls/ExportNodePopover.js

@@ -0,0 +1,61 @@
+"use strict";
+
+const
+   $           = require ("jquery"),
+   Editor      = require ("../Undo/Editor"),
+   UndoManager = require ("../Undo/UndoManager"),
+   _           = require ("../Application/GetText");
+
+require ("./Popover");
+require ("../Bits/Validate");
+
+$.fn.exportNodePopover = function (node, oldExportedName)
+{
+   // Create content.
+
+   const scene = node .getExecutionContext ();
+
+   const nameInput = $("<input></input>")
+      .attr ("placeholder", _ ("Enter exported name"))
+      .val (oldExportedName ?? scene .getUniqueExportName (node .getName ()));
+
+   // Create tooltip.
+
+   const tooltip = this .popover ({
+      content: nameInput,
+      events: {
+         show: (event, api) =>
+         {
+            nameInput .validate (Editor .Id, () =>
+            {
+               $ .beep ();
+               nameInput .highlight ();
+            })
+            .on ("keydown.exportNodePopover", event =>
+            {
+               if (event .key !== "Enter")
+                  return;
+
+               event .preventDefault ();
+
+               api .toggle (false);
+
+               if (!nameInput .val ())
+                  return;
+
+               if (oldExportedName && oldExportedName === nameInput .val ())
+                  return;
+
+               const exportedName = scene .getUniqueExportName (nameInput .val ());
+
+               Editor .updateExportedNode (scene, exportedName, oldExportedName, node);
+            });
+
+            setTimeout (() => nameInput .trigger ("select"), 1);
+         },
+      },
+   })
+
+   return this;
+};
+

package/src/Controls/ImportNodePopover.js

@@ -0,0 +1,61 @@
+"use strict";
+
+const
+   $           = require ("jquery"),
+   Editor      = require ("../Undo/Editor"),
+   UndoManager = require ("../Undo/UndoManager"),
+   _           = require ("../Application/GetText");
+
+require ("./Popover");
+require ("../Bits/Validate");
+
+$.fn.importNodePopover = function (inlineNode, exportedName, oldImportedName)
+{
+   // Create content.
+
+   const executionContext = inlineNode .getExecutionContext ();
+
+   const nameInput = $("<input></input>")
+      .attr ("placeholder", _ ("Enter imported name"))
+      .val (oldImportedName ?? executionContext .getUniqueImportName (exportedName));
+
+   // Create tooltip.
+
+   const tooltip = this .popover ({
+      content: nameInput,
+      events: {
+         show: (event, api) =>
+         {
+            nameInput .validate (Editor .Id, () =>
+            {
+               $ .beep ();
+               nameInput .highlight ();
+            })
+            .on ("keydown.importNodePopover", event =>
+            {
+               if (event .key !== "Enter")
+                  return;
+
+               event .preventDefault ();
+
+               api .toggle (false);
+
+               if (!nameInput .val ())
+                  return;
+
+               if (oldImportedName && oldImportedName === nameInput .val ())
+                  return;
+
+               const importedName = executionContext .getUniqueImportName (nameInput .val ());
+
+               Editor .updateImportedNode (executionContext, inlineNode, exportedName, importedName, oldImportedName);
+            });
+
+            setTimeout (() => nameInput .trigger ("select"), 1);
+         },
+      },
+   })
+
+   return this;
+};
+

package/src/Controls/RenameNodeInput.js

@@ -1,94 +1,94 @@
-"use strict"
+"use strict";
 
 const
    $           = require ("jquery"),
    X3D         = require ("../X3D"),
    Editor      = require ("../Undo/Editor"),
    UndoManager = require ("../Undo/UndoManager"),
-   _           = require ("../Application/GetText")
+   _           = require ("../Application/GetText");
 
-require ("../Bits/Validate")
+require ("../Bits/Validate");
 
 $.fn.renameNodeInput = function (node)
 {
-   this .off ("keydown.renameNodeInput")
-
-   this .val (node ? node .getName () : "")
+   this
+      .off ("keydown.renameNodeInput")
+      .val (node ? node .getName () : "");
 
    this .validate (Editor .Id, () =>
    {
-      $ .beep ()
-      this .highlight ()
+      $ .beep ();
+      this .highlight ();
    })
    .on ("keydown.renameNodeInput", (event) =>
    {
       if (!node)
-         return
+         return;
 
       if (event .key !== "Enter")
-         return
+         return;
 
-      event .preventDefault ()
+      event .preventDefault ();
 
-      let name = this .val ()
+      let name = this .val ();
 
       if (name === node .getName ())
-         return
+         return;
 
-      const executionContext = node .getExecutionContext ()
+      const executionContext = node .getExecutionContext ();
 
       if (node instanceof X3D .X3DProtoDeclarationNode)
       {
          if (!name)
-            return
+            return;
 
          if (node .isExternProto)
          {
-            name = executionContext .getUniqueExternProtoName (name)
+            name = executionContext .getUniqueExternProtoName (name);
 
-            const externproto = node
+            const externproto = node;
 
-            UndoManager .shared .beginUndo (_ ("Update Extern Proto Declaration »%s«"), name)
+            UndoManager .shared .beginUndo (_ ("Update Extern Proto Declaration »%s«"), name);
 
-            Editor .updateExternProtoDeclaration (executionContext, name, externproto)
+            Editor .updateExternProtoDeclaration (executionContext, name, externproto);
 
             if (!executionContext .protos .get (name))
             {
-               const available = Editor .getNextAvailableProtoNode (executionContext, externproto)
+               const available = Editor .getNextAvailableProtoNode (executionContext, externproto);
 
                if (available)
-                  Editor .replaceProtoNodes (executionContext, available, externproto)
+                  Editor .replaceProtoNodes (executionContext, available, externproto);
             }
 
-            UndoManager .shared .endUndo ()
+            UndoManager .shared .endUndo ();
          }
          else
          {
-            name = executionContext .getUniqueProtoName (name)
+            name = executionContext .getUniqueProtoName (name);
 
-            const proto = node
+            const proto = node;
 
-            UndoManager .shared .beginUndo (_ ("Update Proto Declaration »%s«"), name)
+            UndoManager .shared .beginUndo (_ ("Update Proto Declaration »%s«"), name);
 
-            Editor .updateProtoDeclaration (executionContext, name, proto)
+            Editor .updateProtoDeclaration (executionContext, name, proto);
 
-            const available = Editor .getNextAvailableProtoNode (executionContext, proto)
+            const available = Editor .getNextAvailableProtoNode (executionContext, proto);
 
             if (available)
-               Editor .replaceProtoNodes (executionContext, available, proto)
+               Editor .replaceProtoNodes (executionContext, available, proto);
 
-            UndoManager .shared .endUndo ()
+            UndoManager .shared .endUndo ();
          }
       }
       else
       {
          if (name)
-            Editor .updateNamedNode (executionContext, executionContext .getUniqueName (name), node)
+            Editor .updateNamedNode (executionContext, executionContext .getUniqueName (name), node);
          else
-            Editor .removeNamedNode (executionContext, node)
+            Editor .removeNamedNode (executionContext, node);
       }
    })
 
-   return this
-}
+   return this;
+};