sunrize 1.7.42 → 1.7.43

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.7.42",
+  "version": "1.7.43",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {

package/src/Controls/AddPrototypePopover.js

@@ -46,7 +46,7 @@ $.fn.addPrototypePopover = function (executionContext, type)
       events: {
          show (event, api)
          {
-            nameInput .validate (Editor .Id, () =>
+            nameInput .off () .validate (Editor .Id, () =>
             {
                electron .shell .beep ();
                nameInput .highlight ();

package/src/Controls/EditUserDefinedFieldPopover.js

@@ -135,7 +135,7 @@ $.fn.editUserDefinedFieldPopover = function (executionContext, node, field = -1)
       events: {
          show (event, api)
          {
-            nameInput .validate (Editor .Id, () =>
+            nameInput .off () .validate (Editor .Id, () =>
             {
                electron .shell .beep ();
                nameInput .highlight ();

package/src/Controls/ExportNodePopover.js

@@ -26,7 +26,7 @@ $.fn.exportNodePopover = function (node, oldExportedName)
       events: {
          show: (event, api) =>
          {
-            nameInput .validate (Editor .Id, () =>
+            nameInput .off () .validate (Editor .Id, () =>
             {
                electron .shell .beep ();
                nameInput .highlight ();

package/src/Controls/ImportNodePopover.js

@@ -26,7 +26,7 @@ $.fn.importNodePopover = function (inlineNode, exportedName, oldImportedName)
       events: {
          show: (event, api) =>
          {
-            nameInput .validate (Editor .Id, () =>
+            nameInput .off () .validate (Editor .Id, () =>
             {
                electron .shell .beep ();
                nameInput .highlight ();

package/src/Controls/RenameNodePopover.js

@@ -1,11 +1,11 @@
-"use strict"
+"use strict";
 
 const
    $ = require ("jquery"),
-   _ = require ("../Application/GetText")
+   _ = require ("../Application/GetText");
 
-require ("./Popover")
-require ("./RenameNodeInput")
+require ("./Popover");
+require ("./RenameNodeInput");
 
 $.fn.renameNodePopover = function (node)
 {
@@ -13,7 +13,7 @@ $.fn.renameNodePopover = function (node)
 
    const nameInput = $("<input></input>")
       .attr ("placeholder", _("Enter name"))
-      .renameNodeInput (node)
+      .renameNodeInput (node);
 
    // Create tooltip.
 
@@ -22,19 +22,19 @@ $.fn.renameNodePopover = function (node)
       events: {
          show: (event, api) =>
          {
-            nameInput .on ("keydown.renameNodePopover", (event) =>
+            nameInput .off (".renameNodePopover") .on ("keydown.renameNodePopover", (event) =>
             {
                if (event .key !== "Enter")
-                  return
+                  return;
 
-               api .toggle (false)
+               api .toggle (false);
             })
 
-            setTimeout (() => nameInput .trigger ("select"), 1)
+            setTimeout (() => nameInput .trigger ("select"), 1);
          },
       },
-   })
+   });
 
-   return this
-}
+   return this;
+};
 

package/src/Editors/OutlineView.js

@@ -2852,8 +2852,8 @@ module .exports = class OutlineView extends Interface
       element .find (".scene") .addBack (".scene") .each ((i, e) =>
       {
          const
-            element = $(e),
-            scene   = this .getNode (element);
+            child = $(e),
+            scene = this .getNode (child);
 
          scene .externprotos  .removeInterest ("updateSceneSubtree", this);
          scene .protos        .removeInterest ("updateSceneSubtree", this);
@@ -2874,8 +2874,8 @@ module .exports = class OutlineView extends Interface
       element .find (".externproto") .addBack (".externproto") .each ((i, e) =>
       {
          const
-            element = $(e),
-            node    = this .getNode (element);
+            child = $(e),
+            node = this .getNode (child);
 
          node .getLoadState () .removeFieldCallback (this .#updateNodeSymbol);
       });
@@ -2885,12 +2885,12 @@ module .exports = class OutlineView extends Interface
       element .find (".node:not([node-id=NULL]), .exported-node")
          .addBack (".node:not([node-id=NULL]), .exported-node") .each ((i, e) =>
       {
-         const element = $(e);
+         const child = $(e);
 
-         if (!element .jstree ("is_open", element))
+         if (!child .jstree ("is_open", child))
             return;
 
-         const node = this .getNode (element);
+         const node = this .getNode (child);
 
          node .getPredefinedFields ()  .removeInterest ("updateNode", this);
          node .getUserDefinedFields () .removeInterest ("updateNode", this);
@@ -2911,8 +2911,16 @@ module .exports = class OutlineView extends Interface
       element .find (".node:not([node-id=NULL])") .each ((i, e) =>
       {
          const
-            element = $(e),
-            node    = this .getNode (element);
+            child = $(e),
+            node  = this .getNode (child);
+
+         // If node is somewhere else, don't disconnect.
+         if (Array .from (this .sceneGraph .find (`.node[node-id="${node .getId ()}"],
+            .exported-node[node-id="${node .getId ()}"]`))
+            .some (s => !$(s) .closest (element) .length))
+         {
+            return;
+         }
 
          node .typeName_changed .removeFieldCallback (this .#nodeSymbol);
          node .name_changed     .removeFieldCallback (this .#nodeSymbol);
@@ -2947,8 +2955,8 @@ module .exports = class OutlineView extends Interface
       element .find (".exported-node") .each ((i, e) =>
       {
          const
-            element = $(e),
-            node    = this .getNode (element);
+            child = $(e),
+            node = this .getNode (child);
 
          node .typeName_changed .removeFieldCallback (this .#exportedNodeSymbol);
          node .name_changed     .removeFieldCallback (this .#exportedNodeSymbol);
@@ -2957,8 +2965,8 @@ module .exports = class OutlineView extends Interface
       element .find (".field, .special") .each ((i, e) =>
       {
          const
-            element = $(e),
-            field   = this .getField (element);
+            child = $(e),
+            field   = this .getField (child);
 
          field .removeReferencesCallback (this .#fieldSymbol);
          field .removeRouteCallback (this .#fieldSymbol);
@@ -2974,8 +2982,8 @@ module .exports = class OutlineView extends Interface
          element .each ((i, e) =>
          {
             const
-               element = $(e),
-               field   = this .getField (element);
+               child = $(e),
+               field = this .getField (child);
 
             field .removeRouteCallback (this .#routesFullSymbol);
             field .removeFieldCallback (this .#fieldValueSymbol);
@@ -3084,7 +3092,7 @@ module .exports = class OutlineView extends Interface
    {
       const
          target  = $(event .target),
-         element = target .closest (".node, .exported-node", this .sceneGraph),
+         element = target .closest (".node, .exported-node, .imported-node", this .sceneGraph),
          node    = this .getNode (element),
          hidden  = !node .isHidden ();
 
@@ -3093,7 +3101,7 @@ module .exports = class OutlineView extends Interface
 
       node .setHidden (hidden);
 
-      this .sceneGraph .find (`.node[node-id=${node .getId ()}], .exported-node[node-id=${node .getId ()}]`)
+      this .sceneGraph .find (`.node[node-id=${node .getId ()}], .exported-node[node-id=${node .getId ()}], .imported-node[node-id=${node .getId ()}]`)
          .find ("> .item .toggle-visibility")
          .removeClass (["on", "off"])
          .addClass (hidden ? "off" : "on")