easy-file-system 2.1.119 → 2.1.122

package/src/item/entry/drag.js

@@ -13,17 +13,17 @@ import { adjustSourceEntryPath, adjustTargetEntryPath } from "../../utilities/pa
 
 class DragEntryItem extends EntryItem {
   nameSpanChangeHandler = (event, element) => {
-    const nameChanged = this.hasNameChanged();
+    const created = this.isCreated(),
+          explorer = this.getExplorer(),
+          nameSpanName = this.getNameSpanName();
 
-    if (!nameChanged) {
+    if ((nameSpanName === PERIOD) || (nameSpanName === EMPTY_STRING)) {
       this.cancel();
 
       return;
     }
 
-    const created = this.isCreated(),
-          explorer = this.getExplorer(),
-          dragEntryItem = this; ///
+    const dragEntryItem = this; ///
 
     this.reset();
 
@@ -85,16 +85,6 @@ class DragEntryItem extends EntryItem {
     return selected;
   }
 
-  hasNameChanged() {
-    const name = this.getName(),
-          nameSpanName = this.getNameSpanName(),
-          nameChanged = (name !== PERIOD) ?
-                          (nameSpanName !== name) :
-                            (nameSpanName !== EMPTY_STRING);  ///
-
-    return nameChanged;
-  }
-
   isReadOnly() {
     const { readOnly } = this.properties;
 
@@ -209,31 +199,31 @@ class DragEntryItem extends EntryItem {
     explorer.disable();
   }
 
-  reset() {
-    const created = this.isCreated(),
-          explorer = this.getExplorer();
-
-    this.cancelNameSpan();
-
-    this.setCreated(created);
-
-    explorer.enable();
-  }
-
   cancel() {
     const name = this.getName(),
           created = this.isCreated(),
+          explorer = this.getExplorer(),
           nameSpanName = name; ///
 
     this.setNameSpanName(nameSpanName);
 
-    this.reset();
+    this.resetNameSpan();
+
+    explorer.enable();  ///
 
     if (created) {
       this.remove();
     }
   }
 
+  reset() {
+    const explorer = this.getExplorer();
+
+    this.resetNameSpan();
+
+    explorer.enable();
+  }
+
   didMount() {
     this.onStopDrag(this.stopDragHandler);
 

package/src/span/name.js

@@ -3,11 +3,11 @@
 import withStyle from "easy-with-style";  ///
 
 import { keyCodes, arrayUtilities } from "necessary";
+import { Element, window, document } from "easy";
 
 import nameSpanMixins from "../mixins/nameSpan";
 
 import { TRUE, CONTENT_EDITABLE } from "../constants";
-import { Element, window, document } from "easy";
 
 const { first } = arrayUtilities,
       { ENTER_KEY_CODE, ESCAPE_KEY_CODE } = keyCodes;
@@ -38,9 +38,17 @@ class NameSpan extends Element {
 
   setName(name) {
     const domElement = this.getDOMElement(),
-          { childNodes } = domElement,
-          firstChildNode = first(childNodes),
-          textNode = firstChildNode;  ///
+          { firstChild } = domElement;
+
+    let textNode;
+
+    if (firstChild !== null) {
+      textNode = firstChild;  ///
+    } else {
+      textNode = document.createTextNode();
+
+      domElement.appendChild(textNode);
+    }
 
     textNode.nodeValue = name;  ///
   }
@@ -70,7 +78,7 @@ class NameSpan extends Element {
     this.onKeyDown(this.keyDownHandler);
   }
 
-  cancel() {
+  reset() {
     this.offKeyDown(this.keyDownHandler);
 
     this.removeAttribute(CONTENT_EDITABLE, TRUE);
@@ -78,7 +86,7 @@ class NameSpan extends Element {
 
   parentContext() {
     const editNameSpan = this.edit.bind(this), ///
-          cancelNameSpan = this.cancel.bind(this), ///
+          resetNameSpan = this.reset.bind(this), ///
           getNameSpanName = this.getName.bind(this), ///
           setNameSpanName = this.setName.bind(this), ///
           onNameSpanChange = this.onChange.bind(this), ///
@@ -88,7 +96,7 @@ class NameSpan extends Element {
 
     return ({
       editNameSpan,
-      cancelNameSpan,
+      resetNameSpan,
       getNameSpanName,
       setNameSpanName,
       onNameSpanChange,