Stop reflecting file operation results in wrong folders.

chrome/browser/resources/file_manager/js/directory_model.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // If directory files changes too often, don't rescan directory more than once
 // per specified interval
 var SIMULTANEOUS_RESCAN_INTERVAL = 1000;
 // Used for operations that require almost instant rescan.
 var SHORT_RESCAN_INTERVAL = 100;
 
@@ skipping 476 matching lines @@
 };
 
 /**
  * Delete the list of files and directories from filesystem and
  * update the file list.
  * @param {Array.<Entry>} entries Entries to delete.
  * @param {function()=} opt_callback Called when finished.
  */
 DirectoryModel.prototype.deleteEntries = function(entries, opt_callback) {
   var downcount = entries.length + 1;
+  var currentDirPath = this.getCurrentDirPath();
 
   var onComplete = opt_callback ? function() {
     if (--downcount == 0)
       opt_callback();
   } : function() {};
 
   var fileList = this.getFileList();
   for (var i = 0; i < entries.length; i++) {
     var entry = entries[i];
 
     var onSuccess = function(removedEntry) {
-      var index = fileList.indexOf(removedEntry);
-      if (index >= 0)
-        fileList.splice(index, 1);
+      if (currentDirPath == this.getCurrentDirPath()) {
+        var index = fileList.indexOf(removedEntry);
+        if (index >= 0)
+          fileList.splice(index, 1);
+      }
       onComplete();

[Vladislav Kaznacheev, 2012/08/02 12:45:39]

Is it safe to call the callback if the directory has changed.

[SeRya, 2012/08/02 12:56:20]

Sure. And it's called. Only fileList update is omitted in this case.

-    }.bind(null, entry);
+    }.bind(this, entry);
 
     util.removeFileOrDirectory(
         entry,
         onSuccess,
         util.flog('Error deleting ' + entry.fullPath, onComplete));
   }
   onComplete();
 };
 
 /**
@@ skipping 52 matching lines @@
  * Rename the entry in the filesystem and update the file list.
  * @param {Entry} entry Entry to rename.
  * @param {string} newName New name.
  * @param {function} errorCallback Called on error.
  * @param {function} opt_successCallback Called on success.
  */
 DirectoryModel.prototype.renameEntry = function(entry, newName,
                                                 errorCallback,
                                                 opt_successCallback) {
   var self = this;
+  var currentDirPath = this.getCurrentDirPath();
   function onSuccess(newEntry) {
     self.currentDirContents_.prefetchMetadata([newEntry], function() {
+      // Do not change anything or call the callback if current
+      // directory changed.
+      if (currentDirPath != self.getCurrentDirPath())
+        return;
+
       var index = self.findIndexByName_(entry.name);
       if (index >= 0)
         self.getFileList().splice(index, 1, newEntry);
       self.selectEntry(newEntry.name);
       // If the entry doesn't exist in the list it mean that it updated from
       // outside (probably by directory rescan).
       if (opt_successCallback)
         opt_successCallback();
     });
   }
@@ skipping 27 matching lines @@
 
 /**
  * Creates directory and updates the file list.
  *
  * @param {string} name Directory name.
  * @param {function} successCallback Callback on success.
  * @param {function} errorCallback Callback on failure.
  */
 DirectoryModel.prototype.createDirectory = function(name, successCallback,
                                                     errorCallback) {
+  var currentDirPath = this.getCurrentDirPath();

[Vladislav Kaznacheev, 2012/08/02 12:45:39]

I see the pattern here. How about creating a wrapper function, something like
'callUnlessDirectoryChanged'

[SeRya, 2012/08/02 12:56:20]

In my oppinion cost of this level of abstraction doesn't cover its expenses.
It's too simple to care about reusing code.

+
   var onSuccess = function(newEntry) {
+    // Do not change anything or call the callback if current
+    // directory changed.
+    if (currentDirPath != this.getCurrentDirPath())
+      return;
+
     var existing = this.getFileList().slice().filter(
         function(e) {return e.name == name;});
 
     if (existing.length) {
       this.selectEntry(name);
       successCallback(existing[0]);
     } else {
       this.fileListSelection_.beginChange();
       this.getFileList().splice(0, 0, newEntry);
       this.selectEntry(name);
@@ skipping 679 matching lines @@
         }.bind(this));
   }
 };
 
 /**
  * @return {DirectoryEntry} Current watched directory entry.
  */
 FileWatcher.prototype.getWatchedDirectoryEntry = function() {
   return this.watchedDirectoryEntry_;
 };