adobe
diff --git a/‎src/filesystem/FileIndex.js
Copy file name to clipboard
+29-1Lines changed: 29 additions & 1 deletion b/‎src/filesystem/FileIndex.js
Copy file name to clipboard
+29-1Lines changed: 29 additions & 1 deletion
diff --git a/‎src/project/FileTreeView.js
Copy file name to clipboard
+138-10Lines changed: 138 additions & 10 deletions b/‎src/project/FileTreeView.js
Copy file name to clipboard
+138-10Lines changed: 138 additions & 10 deletions
diff --git a/‎src/project/FileTreeViewModel.js
Copy file name to clipboard
+33-10Lines changed: 33 additions & 10 deletions b/‎src/project/FileTreeViewModel.js
Copy file name to clipboard
+33-10Lines changed: 33 additions & 10 deletions
@@ -29,6 +29,8 @@
 define(function (require, exports, module) {
     "use strict";
 
+    var FileUtils = require("file/FileUtils");
+
     /**
      * @constructor
      */
@@ -110,7 +112,9 @@ define(function (require, exports, module) {
      */
     FileIndex.prototype.entryRenamed = function (oldPath, newPath, isDirectory) {
         var path,
-            renameMap = {};
+            renameMap = {},
+            oldParentPath = FileUtils.getParentPath(oldPath),
+            newParentPath = FileUtils.getParentPath(newPath);
 
         // Find all entries affected by the rename and put into a separate map.
         for (path in this._index) {
@@ -138,6 +142,30 @@ define(function (require, exports, module) {
                 item._setPath(renameMap[path]);
             }
         }
+
+
+        // If file path is changed, i.e the file is moved
+        // Remove the moved entry from old Directory and add it to new Directory
+        if (oldParentPath !== newParentPath) {
+            var oldDirectory = this._index[oldParentPath],
+                newDirectory = this._index[newParentPath],
+                renamedEntry;
+
+            if (oldDirectory && oldDirectory._contents) {
+                oldDirectory._contents = oldDirectory._contents.filter(function(entry) {
+                    if (entry.fullPath === newPath) {
+                        renamedEntry = entry;
+                        return false;
+                    }
+                    return true;
+                });
+            }
+
+            if (newDirectory && newDirectory._contents && renamedEntry) {
+                renamedEntry._setPath(newPath);
+                newDirectory._contents.push(renamedEntry);
+            }
+        }
     };
 
     /**
 
@@ -176,7 +176,7 @@ define(function (require, exports, module) {
          * this component, so we keep the model up to date by sending every update via an action.
          */
         handleInput: function (e) {
-            this.props.actions.setRenameValue(this.refs.name.value.trim());
+            this.props.actions.setRenameValue(this.props.parentPath + this.refs.name.value.trim());
 
             if (e.keyCode !== KeyEvent.DOM_VK_LEFT &&
                     e.keyCode !== KeyEvent.DOM_VK_RIGHT) {
@@ -195,6 +195,97 @@ define(function (require, exports, module) {
         }
     };
 
+    /**
+     * This is a mixin that provides drag and drop move function.
+     */
+    var dragAndDrop = {
+        handleDrag: function(e) {
+            // Disable drag when renaming
+            if (this.props.entry.get("rename")) {
+                e.preventDefault();
+                e.stopPropagation();
+                return false;
+            }
+
+            // Pass the dragged item path.
+            e.dataTransfer.setData("text", JSON.stringify({
+                path: this.myPath()
+            }));
+
+            this.props.actions.dragItem(this.myPath());
+
+            this.setDragImage(e);
+            e.stopPropagation();
+        },
+        handleDrop: function(e) {
+            var data = JSON.parse(e.dataTransfer.getData("text"));
+
+            this.props.actions.moveItem(data.path, this.myPath());
+            this.setDraggedOver(false);
+
+            this.clearDragTimeout();
+            e.stopPropagation();
+        },
+
+        handleDragEnd: function(e) {
+            this.clearDragTimeout();
+        },
+
+        handleDragOver: function(e) {
+            var data = JSON.parse(e.dataTransfer.getData("text"));
+
+            if (data.path === this.myPath() || FileUtils.getParentPath(data.path) === this.myPath()) {
+                e.preventDefault();
+                e.stopPropagation();
+                return;
+            }
+            var self = this;
+            this.setDraggedOver(true);
+
+            // Open the directory tree when item is dragged over a directory
+            if (!this.dragOverTimeout) {
+                this.dragOverTimeout = window.setTimeout(function() {
+                    self.props.actions.setDirectoryOpen(self.myPath(), true);
+                    self.dragOverTimeout = null;
+                }, 800);
+            }
+
+            e.preventDefault(); // Allow the drop
+            e.stopPropagation();
+        },
+
+        handleDragLeave: function(e) {
+            this.setDraggedOver(false);
+            this.clearDragTimeout();
+        },
+
+        clearDragTimeout: function() {
+            if (this.dragOverTimeout) {
+                clearTimeout(this.dragOverTimeout);
+                this.dragOverTimeout = null;
+            }
+        },
+        setDraggedOver: function(draggedOver) {
+            if (this.state.draggedOver !== draggedOver) {
+                this.setState({
+                    draggedOver: draggedOver
+                });
+            }
+        },
+
+        setDragImage: function(e) {
+            var div = window.document.createElement('div');
+            div.style.position = 'absolute';
+            div.style.color = '#fff';
+            div.textContent = this.props.name;
+            window.document.body.appendChild(div);
+            e.dataTransfer.setDragImage(div, -10, -10);
+            setTimeout(function() {
+                window.document.body.removeChild(div);
+            }, 0);
+        }
+    };
+
     /**
      * @private
      *
@@ -265,7 +356,6 @@ define(function (require, exports, module) {
             if (this.props.entry.get("rename")) {
                 return;
             }
-            e.preventDefault();
         }
     };
 
@@ -363,7 +453,7 @@ define(function (require, exports, module) {
      * * forceRender: causes the component to run render
      */
     var fileNode = Preact.createFactory(Preact.createClass({
-        mixins: [contextSettable, pathComputer, extendable],
+        mixins: [contextSettable, pathComputer, extendable, dragAndDrop],
 
         /**
          * Ensures that we always have a state object.
@@ -504,7 +594,9 @@ define(function (require, exports, module) {
                     className: this.getClasses("jstree-leaf"),
                     onClick: this.handleClick,
                     onMouseDown: this.handleMouseDown,
-                    onDoubleClick: this.handleDoubleClick
+                    onDoubleClick: this.handleDoubleClick,
+                    draggable: true,
+                    onDragStart: this.handleDrag
                 },
                 DOM.ins({
                     className: "jstree-icon"
@@ -645,7 +737,13 @@ define(function (require, exports, module) {
      * * forceRender: causes the component to run render
      */
     directoryNode = Preact.createFactory(Preact.createClass({
-        mixins: [contextSettable, pathComputer, extendable],
+        mixins: [contextSettable, pathComputer, extendable, dragAndDrop],
+
+        getInitialState: function() {
+            return {
+                draggedOver: false
+            };
+        },
 
         /**
          * We need to update this component if the sort order changes or our entry object
@@ -656,7 +754,8 @@ define(function (require, exports, module) {
             return nextProps.forceRender ||
                 this.props.entry !== nextProps.entry ||
                 this.props.sortDirectoriesFirst !== nextProps.sortDirectoriesFirst ||
-                this.props.extensions !== nextProps.extensions;
+                this.props.extensions !== nextProps.extensions ||
+                (nextState !== undefined && this.state.draggedOver !== nextState.draggedOver);
         },
 
         /**
@@ -744,11 +843,22 @@ define(function (require, exports, module) {
                 'context-node': entry.get("context")
             });
 
+            var nodeClasses = "jstree-" + nodeClass;
+            if (this.state.draggedOver) {
+                nodeClasses += " jstree-draggedOver";
+            }
+
             var liArgs = [
                 {
-                    className: this.getClasses("jstree-" + nodeClass),
+                    className: this.getClasses(nodeClasses),
                     onClick: this.handleClick,
-                    onMouseDown: this.handleMouseDown
+                    onMouseDown: this.handleMouseDown,
+                    draggable: true,
+                    onDragStart: this.handleDrag,
+                    onDrop: this.handleDrop,
+                    onDragEnd: this.handleDragEnd,
+                    onDragOver: this.handleDragOver,
+                    onDragLeave: this.handleDragLeave
                 },
                 _createAlignedIns(this.props.depth)
             ];
@@ -1001,6 +1111,19 @@ define(function (require, exports, module) {
                 this.props.selectionViewInfo !== nextProps.selectionViewInfo;
         },
 
+        handleDrop: function(e) {
+            var data = JSON.parse(e.dataTransfer.getData("text"));
+            this.props.actions.moveItem(data.path, this.props.parentPath);
+            e.stopPropagation();
+        },
+
+        /**
+         * Allow the Drop
+         */
+        handleDragOver: function(e) {
+            e.preventDefault();
+        },
+
         render: function () {
             var selectionBackground = fileSelectionBox({
                 ref: "selectionBackground",
@@ -1042,10 +1165,15 @@ define(function (require, exports, module) {
                     actions: this.props.actions,
                     forceRender: this.props.forceRender,
                     platform: this.props.platform
-                });
+                }),
+                args = {
+                    onDrop: this.handleDrop,
+                    onDragOver: this.handleDragOver
+                };
+
 
             return DOM.div(
-                null,
+                args,
                 contents,
                 selectionBackground,
                 contextBackground,
 
@@ -461,34 +461,57 @@ define(function (require, exports, module) {
     };
 
     /**
-     * Changes the name of the item at the `currentPath` to `newName`.
+     * Changes the path of the item at the `currentPath` to `newPath`.
      *
      * @param {string} currentPath project relative file path to the current item
-     * @param {string} newName Name to give the item
+     * @param {string} newPath project relative new path to give the item
      */
-    FileTreeViewModel.prototype.renameItem = function (currentPath, newName) {
+    FileTreeViewModel.prototype.renameItem = function (oldPath, newPath) {
         var treeData = this._treeData,
-            objectPath = _filePathToObjectPath(treeData, currentPath);
+            oldObjectPath = _filePathToObjectPath(treeData, oldPath),
+            newDirectoryPath = FileUtils.getParentPath(newPath),
+            newObjectPath = _filePathToObjectPath(treeData, newDirectoryPath);
 
-        if (!objectPath) {
+        if (!oldObjectPath || !newObjectPath) {
             return;
         }
 
-        var originalName = _.last(objectPath),
-            currentObject = treeData.getIn(objectPath);
+        var originalName = _.last(oldObjectPath),
+            newName = FileUtils.getBaseName(newPath),
+            currentObject;
 
         // Back up to the parent directory
-        objectPath.pop();
+        oldObjectPath.pop();
 
-        treeData = treeData.updateIn(objectPath, function (directory) {
+        // Remove the oldPath
+        treeData = treeData.updateIn(oldObjectPath, function (directory) {
+            currentObject = directory.get(originalName);
             directory = directory.delete(originalName);
-            directory = directory.set(newName, currentObject);
             return directory;
         });
 
+        // Add the newPath
+
+        // If the new directory is not loaded, create a not fully loaded directory there,
+        // so that we can add the new item as a child of new directory
+        if (!this.isPathLoaded(newDirectoryPath)) {
+            treeData = treeData.updateIn(newObjectPath, _createNotFullyLoadedDirectory);
+        }
+
+        // If item moved to root directory, objectPath should not have "children",
+        // otherwise the objectPath should have "children"
+        if (newObjectPath.length > 0) {
+            newObjectPath.push("children");
+        }
+
+        treeData = treeData.updateIn(newObjectPath, function (children) {
+            return children.set(newName, currentObject);
+        });
+
         this._commit(treeData);
     };
 
+
     /**
      * @private
      *