Photo Editor: better mode transitions

chrome/browser/resources/file_manager/js/photo/slide_mode.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.
 
 /**
  * Slide mode displays a single image and has a set of controls to navigate
  * between the images and to edit an image.
  *
  * TODO(kaznacheev): Introduce a parameter object.
  *
@@ skipping 263 matching lines @@
               displayCallback, loadDone);
         }.bind(this));
 
   }
 };
 
 /**
  * Leave the mode.
  * @param {Rect} zoomToRect Rectangle for zoom effect.
  * @param {function} callback Called when the image is committed and
- *   the zoom-out animation is done.
+ *   the zoom-out animation has started.
  */
 SlideMode.prototype.leave = function(zoomToRect, callback) {
   if (this.prefetchTimer_) {
     clearTimeout(this.prefetchTimer_);
     this.prefetchTimer_ = null;
   }
 
   var commitDone = function() {
       this.stopEditing_();
       this.stopSlideshow_();
       ImageUtil.setAttribute(this.arrowBox_, 'active', false);
-      this.unloadImage_(zoomToRect);
       this.selectionModel_.removeEventListener(
           'change', this.onSelectionBound_);
       this.dataModel_.removeEventListener('splice', this.onSpliceBound_);
       this.ribbon_.disable();
       this.active_ = false;
       if (this.savedSelection_)
         this.selectionModel_.selectedIndexes = this.savedSelection_;
-      if (zoomToRect)
-        setTimeout(callback, ImageView.ANIMATION_WAIT_INTERVAL);
-      else
-        callback();
+      this.unloadImage_(zoomToRect);
+      callback();
     }.bind(this);
 
   if (this.getItemCount_() == 0) {
     this.showErrorBanner_(false);
     commitDone();
   } else {
     this.commitItem_(commitDone);
   }
 };
 
@@ skipping 31 matching lines @@
 };
 
 /**
  * @return {Gallery.Item} Selected index.
  */
 SlideMode.prototype.getSelectedIndex = function() {
   return this.selectionModel_.selectedIndex;
 };
 
 /**
+ * @return {Rect} Screen rectangle of the selected image.
+ */
+SlideMode.prototype.getSelectedImageRect = function() {
+  if (this.getSelectedIndex() < 0)

[dgozman, 2012/09/14 15:17:38]

No selection in slide mode?

[Vladislav Kaznacheev, 2012/09/14 16:20:04]

It is possible if there is 0 items. 
On 2012/09/14 15:17:38, dgozman wrote:

+    return null;
+  else
+    return this.viewport_.getScreenClipped();
+};
+
+/**
  * @return {Gallery.Item} Selected item
  */
 SlideMode.prototype.getSelectedItem = function() {
   return this.getItem(this.getSelectedIndex());
 };
 
 /**
  * Selection change handler.
  *
  * Commits the current image and displays the newly selected image.
@@ skipping 795 matching lines @@
       done = true;
     }
   }.bind(this);
 };
 
 /**
  * If the user touched the image and moved the finger more than SWIPE_THRESHOLD
  * horizontally it's considered as a swipe gesture (change the current image).
  */
 SwipeOverlay.SWIPE_THRESHOLD = 100;