Cleanup: Remove unnecessary property: VolumeList.currentVolume_

chrome/browser/resources/file_manager/js/volume_list.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.
 
 'use strict';
 
 /**
  * A volume list model. This model combines the 2 lists.
  * @param {cr.ui.ArrayDataModel} volumesList The first list of the model.
  * @param {cr.ui.ArrayDataModel} pinnedList The second list of the model.
@@ skipping 168 matching lines @@
   this.directoryModel_ = directoryModel;
   this.volumeManager_ = VolumeManager.getInstance();
   this.selectionModel = new cr.ui.ListSingleSelectionModel();
 
   this.directoryModel_.addEventListener('directory-changed',
       this.onCurrentDirectoryChanged_.bind(this));
   this.selectionModel.addEventListener(
       'change', this.onSelectionChange_.bind(this));
   this.selectionModel.addEventListener(
       'beforeChange', this.onBeforeSelectionChange_.bind(this));
-  this.currentVolume_ = null;
-
 
   this.scrollBar_ = new ScrollBar();
   this.scrollBar_.initialize(this.parentNode, this);
 
   // Overriding default role 'list' set by cr.ui.List.decorate() to 'listbox'
   // role for better accessibility on ChromeOS.
   this.setAttribute('role', 'listbox');
 
   var self = this;
   this.itemConstructor = function(path) {
@@ skipping 106 matching lines @@
 /**
  * Selects the n-th volume from the list.
  * @param {number} index Volume index.
  * @return {boolean} True for success, otherwise false.
  */
 VolumeList.prototype.selectByIndex = function(index) {
   if (index < 0 || index > this.dataModel.length - 1)
     return false;
 
   var newPath = this.dataModel.item(index);
-  if (!newPath || this.currentVolume_ == newPath)
+  if (!newPath)
     return false;
 
-  this.currentVolume_ = newPath;
-  this.directoryModel_.changeDirectory(this.currentVolume_);
+  // Prevents double-moving to the current directory.

[mtomasz, 2013/08/06 03:46:20]

The problem here is that it won't work when being in a subdirectory. This check
will fail when clicking on 'Drive' and having opened some subdirectory on Drive.
It should stop from reselecting, but it won't.

That's why I was thinking if it is better to remove this check, since it doesn't
work in many cases and it is misleading. Also, is it possible to get a
selectByIndex call on the item which is already selected?

[mtomasz, 2013/08/06 03:48:35]

Sorry, I misunderstood this method. Please ignore this comment.

+  if (this.directoryModel_.getCurrentDirEntry().fullPath == newPath)
+    return false;
+
+  this.directoryModel_.changeDirectory(newPath);
   return true;
 };
 
 /**
  * Handler before root item change.
  * @param {Event} event The event.
  * @private
  */
 VolumeList.prototype.onBeforeSelectionChange_ = function(event) {
   if (event.changes.length == 1 && !event.changes[0].selected)
@@ skipping 16 matching lines @@
 
 /**
  * Invoked when the current directory is changed.
  * @param {Event} event The event.
  * @private
  */
 VolumeList.prototype.onCurrentDirectoryChanged_ = function(event) {
   var path = event.newDirEntry.fullPath || this.dataModel.getCurrentDirPath();
   var newRootPath = PathUtil.getRootPath(path);
 
-  // Sets |this.currentVolume_| in advance to prevent |onSelectionChange_()|
-  // from calling |DirectoryModel.ChangeDirectory()| again.
-  this.currentVolume_ = newRootPath;
-
   // Synchronizes the volume list selection with the current directory, after
   // it is changed outside of the volume list.
 
   // (1) Select the nearest parent directory (including the pinned directories).
   var bestMatchIndex = -1;
   var bestMatchSubStringLen = 0;
   for (var i = 0; i < this.dataModel.length; i++) {
     var itemPath = this.dataModel.item(i);
     if (path.indexOf(itemPath) == 0) {
       if (bestMatchSubStringLen < itemPath.length) {
@@ skipping 15 matching lines @@
     var itemPath = this.dataModel.item(i);
     if (PathUtil.getRootPath(itemPath) == newRootPath) {
       // Not to invoke the handler of this instance, sets the guard.
       this.dontHandleSelectionEvent_ = true;
       this.selectionModel.selectedIndex = i;
       this.dontHandleSelectionEvent_ = false;
       return;
     }
   }
 };