easy-file-system 2.1.14 → 2.1.17

package/src/item/entry/drag.js

@@ -27,23 +27,25 @@ class DragEntryItem extends EntryItem {
 
     if (created) {
       explorer.createDragEntryItem(dragEntryItem, () => {
-        this.cancel();
+        this.done();
       });
 
       return;
     }
 
     explorer.renameDragEntryItem(dragEntryItem, () => {
-      this.cancel();
+      this.done();
     });
   }
 
   nameSpanCancelHandler = (event, element) => {
     const created = this.isCreated();
 
-    created ?
-      this.remove() :
-        this.cancel();
+    if (created) {
+      this.remove();
+    }
+
+    this.done();
   }
 
   startDragHandler = (element) => {
@@ -172,6 +174,8 @@ class DragEntryItem extends EntryItem {
     this.setNameSpanName(nameSpanName);
 
     this.editNameSpan();
+
+    this.disableDrag();
   }
 
   edit() {
@@ -184,15 +188,19 @@ class DragEntryItem extends EntryItem {
     this.setNameSpanName(nameSpanName);
 
     this.editNameSpan();
+
+    this.disableDrag();
   }
 
-  cancel() {
+  done() {
     const name = this.getName(),
           nameSpanName = name; ///
 
     this.setNameSpanName(nameSpanName);
 
     this.cancelNameSpan();
+
+    this.enableDrag();
   }
 
   didMount() {

package/src/span/name.js

@@ -2,15 +2,15 @@
 
 import withStyle from "easy-with-style";  ///
 
-import { arrayUtilities } from "necessary";
+import { keyCodes, arrayUtilities } from "necessary";
 
 import nameSpanMixins from "../mixins/nameSpan";
 
+import { TRUE, CONTENT_EDITABLE } from "../constants";
 import { Element, window, document } from "easy";
-import { ENTER_KEY_CODE, ESCAPE_KEY_CODE } from "../keyCodes";
-import { ROLE, TRUE, TEXTBOX, CONTENT_EDITABLE } from "../constants";
 
-const { first } = arrayUtilities;
+const { first } = arrayUtilities,
+      { ENTER_KEY_CODE, ESCAPE_KEY_CODE } = keyCodes;
 
 class NameSpan extends Element {
   keyDownHandler = (event, element) => {
@@ -30,7 +30,8 @@ class NameSpan extends Element {
   }
 
   isEditable() {
-    const editable = this.hasClass("editable");
+    const contentEditable = this.hasAttribute(CONTENT_EDITABLE),
+          editable = contentEditable; ///
 
     return editable;
   }
@@ -54,10 +55,6 @@ class NameSpan extends Element {
   edit() {
     this.focus();
 
-    this.addClass("editable");
-
-    this.addAttribute(ROLE, TEXTBOX);
-
     this.addAttribute(CONTENT_EDITABLE, TRUE);
 
     const html = this.html(),
@@ -83,10 +80,6 @@ class NameSpan extends Element {
   cancel() {
     this.offKeyDown(this.keyDownHandler);
 
-    this.removeClass("editable");
-
-    this.removeAttribute(ROLE, TEXTBOX);
-
     this.removeAttribute(CONTENT_EDITABLE, TRUE);
   }
 
@@ -133,7 +126,7 @@ export default withStyle(NameSpan)`
   font-weight: inherit;
   font-family: inherit;
 
-  .editable {
+  [contentEditable] {
     border: 1px solid black;
     padding: 4px;
   }

package/lib/keyCodes.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    ENTER_KEY_CODE: function() {
-        return ENTER_KEY_CODE;
-    },
-    ESCAPE_KEY_CODE: function() {
-        return ESCAPE_KEY_CODE;
-    },
-    DELETE_KEY_CODE: function() {
-        return DELETE_KEY_CODE;
-    },
-    BACKSPACE_KEY_CODE: function() {
-        return BACKSPACE_KEY_CODE;
-    }
-});
-var ENTER_KEY_CODE = 13;
-var ESCAPE_KEY_CODE = 27;
-var DELETE_KEY_CODE = 46;
-var BACKSPACE_KEY_CODE = 8;
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9rZXlDb2Rlcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IGNvbnN0IEVOVEVSX0tFWV9DT0RFID0gMTM7XG5leHBvcnQgY29uc3QgRVNDQVBFX0tFWV9DT0RFID0gMjc7XG5leHBvcnQgY29uc3QgREVMRVRFX0tFWV9DT0RFID0gNDY7XG5leHBvcnQgY29uc3QgQkFDS1NQQUNFX0tFWV9DT0RFID0gODtcbiJdLCJuYW1lcyI6WyJFTlRFUl9LRVlfQ09ERSIsIkVTQ0FQRV9LRVlfQ09ERSIsIkRFTEVURV9LRVlfQ09ERSIsIkJBQ0tTUEFDRV9LRVlfQ09ERSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBRWFBLGNBQWM7ZUFBZEE7O0lBQ0FDLGVBQWU7ZUFBZkE7O0lBQ0FDLGVBQWU7ZUFBZkE7O0lBQ0FDLGtCQUFrQjtlQUFsQkE7OztBQUhOLElBQU1ILGlCQUFpQjtBQUN2QixJQUFNQyxrQkFBa0I7QUFDeEIsSUFBTUMsa0JBQWtCO0FBQ3hCLElBQU1DLHFCQUFxQiJ9

package/src/keyCodes.js

@@ -1,6 +0,0 @@
-"use strict";
-
-export const ENTER_KEY_CODE = 13;
-export const ESCAPE_KEY_CODE = 27;
-export const DELETE_KEY_CODE = 46;
-export const BACKSPACE_KEY_CODE = 8;