easy-file-system 2.1.92 → 2.1.95

package/src/item/entry/drag.js

@@ -45,15 +45,9 @@ class DragEntryItem extends EntryItem {
   }
 
   startDragHandler = (element) => {
-    const explorer = this.getExplorer(),
-          editing = explorer.isEditing();
-
-    if (editing) {
-      return;
-    }
-
     const path = this.getPath(),
           type = this.getType(),
+          explorer = this.getExplorer(),
           dragEntryItemType = type,  ///
           markerEntryItemPath = path;  ///
 
@@ -164,13 +158,6 @@ class DragEntryItem extends EntryItem {
     return created;
   }
 
-  isEditing() {
-    const nameSpanEditing = this.isNameSpanEditing(),
-          editing = nameSpanEditing; ///
-
-    return editing;
-  }
-
   isSelected() {
     const selected = this.hasClass("selected"); ///
 
@@ -199,17 +186,13 @@ class DragEntryItem extends EntryItem {
   }
 
   edit() {
-    const explorer = this.getExplorer(),
-          editing = explorer.isEditing();
-
-    if (editing) {
-      return;
-    }
-
     const name = this.getName(),
           created = false,
+          explorer = this.getExplorer(),
           nameSpanName = name; ///
 
+    explorer.disable();
+
     this.setCreated(created);
 
     this.setNameSpanName(nameSpanName);
@@ -220,13 +203,16 @@ class DragEntryItem extends EntryItem {
   }
 
   reset() {
-    const created = this.isCreated();
+    const created = this.isCreated(),
+          explorer = this.getExplorer();
 
-    this.cancelNameSpan();
+    explorer.enable();
 
-    this.enableDrag();
+    this.cancelNameSpan();
 
     this.setCreated(created);
+
+    this.enableDrag();
   }
 
   cancel() {
@@ -299,7 +285,7 @@ Object.assign(EntryItem.prototype, dragMixins);
 export default withStyle(DragEntryItem)`
 
   user-select: none;
-  
+    
   font-weight: normal;
   
   .selected {

package/src/span/name.js

@@ -29,13 +29,6 @@ class NameSpan extends Element {
     }
   }
 
-  isEditing() {
-    const contentEditable = this.hasAttribute(CONTENT_EDITABLE),
-          editing = contentEditable; ///
-
-    return editing;
-  }
-
   getName() {
     const html = this.html(),
           name = html;  ///
@@ -91,8 +84,7 @@ class NameSpan extends Element {
           onNameSpanChange = this.onChange.bind(this), ///
           onNameSpanCancel = this.onCancel.bind(this), ///
           offNameSpanChange = this.offChange.bind(this), ///
-          offNameSpanCancel = this.offCancel.bind(this), ///
-          isNameSpanEditing = this.isEditing.bind(this); ///
+          offNameSpanCancel = this.offCancel.bind(this); ///
 
     return ({
       editNameSpan,
@@ -102,8 +94,7 @@ class NameSpan extends Element {
       onNameSpanChange,
       onNameSpanCancel,
       offNameSpanChange,
-      offNameSpanCancel,
-      isNameSpanEditing
+      offNameSpanCancel
     });
   }