easy-file-system 2.1.101 → 2.1.104

package/src/eventTypes.js

@@ -2,11 +2,11 @@
 
 export const OPEN_EVENT_TYPE = "open";
 export const MOVE_EVENT_TYPE = "move";
-export const EDIT_EVENT_TYPE = "edit";
 export const CHANGE_EVENT_TYPE = "change";
 export const CANCEL_EVENT_TYPE = "cancel";
-export const REMOVE_EVENT_TYPE = "remove";
 export const SELECT_EVENT_TYPE = "select";
+export const RENAME_EVENT_TYPE = "rename";
+export const REMOVE_EVENT_TYPE = "remove";
 export const CREATE_EVENT_TYPE = "create";
 
 export default {
@@ -14,8 +14,8 @@ export default {
   MOVE_EVENT_TYPE,
   CHANGE_EVENT_TYPE,
   CANCEL_EVENT_TYPE,
-  EDIT_EVENT_TYPE,
-  REMOVE_EVENT_TYPE,
   SELECT_EVENT_TYPE,
+  REMOVE_EVENT_TYPE,
+  RENAME_EVENT_TYPE,
   CREATE_EVENT_TYPE
 };

package/src/example/view.js

@@ -17,10 +17,10 @@ export default class View extends Element {
     Explorer.createDirectoryPath();
   }
 
-  editSelectedPathButtonClickHandler = (event, element) => {
+  renameSelectedPathButtonClickHandler = (event, element) => {
     const firstExplorer = this.getFirstExplorer();
 
-    firstExplorer.editSelectedPath();
+    firstExplorer.renameSelectedPath();
   }
 
   createFilePathButtonClickHandler = (event, element) => {
@@ -33,12 +33,6 @@ export default class View extends Element {
     console.log("open", filePath)
   }
 
-  editHandler = (pathMaps, explorer, done) => {
-    console.log("edit", JSON.stringify(pathMaps, null, "  "))
-
-    done();
-  }
-
   moveHandler = (pathMaps, explorer, done) => {
     console.log("move", JSON.stringify(pathMaps, null, "  "))
 
@@ -51,6 +45,12 @@ export default class View extends Element {
     done();
   }
 
+  renameHandler = (pathMaps, explorer, done) => {
+    console.log("rename", JSON.stringify(pathMaps, null, "  "))
+
+    done();
+  }
+
   createHandler = (pathMaps, explorer, done) => {
     console.log("create", JSON.stringify(pathMaps, null, "  "))
 
@@ -88,14 +88,14 @@ export default class View extends Element {
       <RubbishBin onRemove={this.removeHandler} />,
       <FirstExplorer onOpen={this.openHandler}
                      onMove={this.moveHandler}
-                     onEdit={this.editHandler}
                      onRemove={this.removeHandler}
+                     onRename={this.renameHandler}
                      onCreate={this.createHandler}
                      onSelect={this.selectHandler}
       />,
       <SecondExplorer onOpen={this.openHandler}
                       onMove={this.moveHandler}
-                      onEdit={this.editHandler}
+                      onRename={this.renameHandler}
                       onRemove={this.removeHandler}
                       onCreate={this.createHandler}
       />,
@@ -105,8 +105,8 @@ export default class View extends Element {
       <Button onClick={this.createDirectoryPathButtonClickHandler}>
         Create directory path
       </Button>,
-      <Button onClick={this.editSelectedPathButtonClickHandler}>
-        Edit selected path
+      <Button onClick={this.renameSelectedPathButtonClickHandler}>
+        Rename selected path
       </Button>
 
     ]);

package/src/explorer.js

@@ -231,11 +231,11 @@ class Explorer extends Element {
     directoryNameDragEntryItem.create();
   }
 
-  editSelectedPath() {
+  renameSelectedPath() {
     const selectedDragEntryItem = this.retrieveSelectedDragEntryItem();
 
     if (selectedDragEntryItem !== null) {
-      selectedDragEntryItem.edit();
+      selectedDragEntryItem.rename();
     }
   }
 
@@ -294,13 +294,13 @@ class Explorer extends Element {
     this.callSelectHandlers(path, selected, readOnly, explorer);
   }
 
-  editDragEntryItem(dragEntryItem, done) {
+  renameDragEntryItem(dragEntryItem, done) {
     const sourceEntryPath = sourceEntryPathFromEntryItem(dragEntryItem),
           targetEntryPath = targetEntryPathFromEntryItem(dragEntryItem),
           pathMaps = dragEntryItem.getPathMaps(sourceEntryPath, targetEntryPath),
           explorer = this;  ///
 
-    this.editDragEntryItems(pathMaps, explorer, () => {
+    this.renameDragEntryItems(pathMaps, explorer, () => {
       done();
     });
   }
@@ -331,8 +331,8 @@ class Explorer extends Element {
     });
   }
 
-  editDragEntryItems(pathMaps, explorer, done) {
-    this.callEditHandlersAsync(pathMaps, explorer, () => {
+  renameDragEntryItems(pathMaps, explorer, done) {
+    this.callRenameHandlersAsync(pathMaps, explorer, () => {
       pathMaps.forEach((pathMap) => {
         this.removeDragEntryItem(pathMap, explorer);
       });

package/src/item/entry/drag.js

@@ -21,12 +21,12 @@ class DragEntryItem extends EntryItem {
       return;
     }
 
-    this.reset();
-
     const created = this.isCreated(),
           explorer = this.getExplorer(),
           dragEntryItem = this; ///
 
+    this.reset();
+
     if (created) {
       explorer.createDragEntryItem(dragEntryItem, () => {
         ///
@@ -35,7 +35,7 @@ class DragEntryItem extends EntryItem {
       return;
     }
 
-    explorer.editDragEntryItem(dragEntryItem, () => {
+    explorer.renameDragEntryItem(dragEntryItem, () => {
       ///
     });
   }
@@ -186,7 +186,7 @@ class DragEntryItem extends EntryItem {
     explorer.disable();
   }
 
-  edit() {
+  rename() {
     const name = this.getName(),
           created = false,
           explorer = this.getExplorer(),

package/src/mixins/explorer.js

@@ -2,7 +2,7 @@
 
 import { asynchronousUtilities } from "necessary";
 
-import { MOVE_EVENT_TYPE, OPEN_EVENT_TYPE, REMOVE_EVENT_TYPE, EDIT_EVENT_TYPE, SELECT_EVENT_TYPE, CREATE_EVENT_TYPE } from "../eventTypes";
+import { MOVE_EVENT_TYPE, OPEN_EVENT_TYPE, REMOVE_EVENT_TYPE, RENAME_EVENT_TYPE, SELECT_EVENT_TYPE, CREATE_EVENT_TYPE } from "../eventTypes";
 
 const { forEach } = asynchronousUtilities;
 
@@ -20,20 +20,6 @@ function offOpen(openHandler, element) {
   this.removeEventListener(eventType, handler, element);
 }
 
-function onEdit(renameHandler, element) {
-  const eventType = EDIT_EVENT_TYPE,
-        handler = renameHandler;  ///
-
-  this.addEventListener(eventType, handler, element);
-}
-
-function offEdit(renameHandler, element) {
-  const eventType = EDIT_EVENT_TYPE,
-        handler = renameHandler;  ///
-
-  this.removeEventListener(eventType, handler, element);
-}
-
 function onMove(moveHandler, element) {
   const eventType = MOVE_EVENT_TYPE,
         handler = moveHandler;  ///
@@ -62,6 +48,20 @@ function offRemove(removeHandler, element) {
   this.removeEventListener(eventType, handler, element);
 }
 
+function onRename(renameHandler, element) {
+  const eventType = RENAME_EVENT_TYPE,
+        handler = renameHandler;  ///
+
+  this.addEventListener(eventType, handler, element);
+}
+
+function offRename(renameHandler, element) {
+  const eventType = RENAME_EVENT_TYPE,
+        handler = renameHandler;  ///
+
+  this.removeEventListener(eventType, handler, element);
+}
+
 function onCreate(createHandler, element) {
   const eventType = CREATE_EVENT_TYPE,
         handler = createHandler;  ///
@@ -114,8 +114,8 @@ function callSelectHandlers(path, selected, readOnly, explorer) {
   });
 }
 
-function callEditHandlersAsync(pathMaps, explorer, done) {
-  const eventType = EDIT_EVENT_TYPE,
+function callRenameHandlersAsync(pathMaps, explorer, done) {
+  const eventType = RENAME_EVENT_TYPE,
         eventListeners = this.findEventListeners(eventType);
 
   forEach(eventListeners, (eventListener, next) => {
@@ -171,19 +171,19 @@ const explorerMixins = {
   offOpen,
   onMove,
   offMove,
-  onEdit,
-  offEdit,
   onRemove,
   offRemove,
+  onRename,
+  offRename,
   onCreate,
   offCreate,
   onSelect,
   offSelect,
   callOpenHandlers,
   callSelectHandlers,
-  callEditHandlersAsync,
   callMoveHandlersAsync,
   callRemoveHandlersAsync,
+  callRenameHandlersAsync,
   callCreateHandlersAsync
 };