Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: ui/file_manager/gallery/js/image_editor/image_view.js

Issue 448973003: Gallery: Fix undo of cropping images. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/data/extensions/api_test/file_manager_browsertest/gallery/test_util.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 'use strict'; 5 'use strict';
6 6
7 /** 7 /**
8 * The overlay displaying the image. 8 * The overlay displaying the image.
9 * 9 *
10 * @param {HTMLElement} container The container element. 10 * @param {HTMLElement} container The container element.
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 var newScreenImage = this.screenImage_; 636 var newScreenImage = this.screenImage_;
637 var setFade = ImageUtil.setAttribute.bind(null, newScreenImage, 'fade'); 637 var setFade = ImageUtil.setAttribute.bind(null, newScreenImage, 'fade');
638 setFade(true); 638 setFade(true);
639 oldScreenImage.parentNode.insertBefore(newScreenImage, oldScreenImage); 639 oldScreenImage.parentNode.insertBefore(newScreenImage, oldScreenImage);
640 var effect = new ImageView.Effect.Zoom( 640 var effect = new ImageView.Effect.Zoom(
641 this.viewport_.getImageBounds().width, 641 this.viewport_.getImageBounds().width,
642 this.viewport_.getImageBounds().height, 642 this.viewport_.getImageBounds().height,
643 imageCropRect); 643 imageCropRect);
644 644
645 // Animate to the transformed state. 645 // Animate to the transformed state.
646 this.setTransform_(oldScreenImage, this,viewport_, effect); 646 this.setTransform_(oldScreenImage, this.viewport_, effect);
647 setTimeout(setFade.bind(null, false), 0); 647 setTimeout(setFade.bind(null, false), 0);
648 setTimeout(function() { 648 setTimeout(function() {
649 if (oldScreenImage.parentNode) 649 if (oldScreenImage.parentNode)
650 oldScreenImage.parentNode.removeChild(oldScreenImage); 650 oldScreenImage.parentNode.removeChild(oldScreenImage);
651 }, effect.getSafeInterval()); 651 }, effect.getSafeInterval());
652 652
653 return effect.getSafeInterval(); 653 return effect.getSafeInterval();
654 }; 654 };
655 655
656 /* Transition effects */ 656 /* Transition effects */
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 }; 833 };
834 834
835 ImageView.Effect.Rotate.prototype = { __proto__: ImageView.Effect.prototype }; 835 ImageView.Effect.Rotate.prototype = { __proto__: ImageView.Effect.prototype };
836 836
837 /** 837 /**
838 * @override 838 * @override
839 */ 839 */
840 ImageView.Effect.Rotate.prototype.transform = function(element, viewport) { 840 ImageView.Effect.Rotate.prototype.transform = function(element, viewport) {
841 return viewport.getInverseTransformForRotatedImage(this.orientation_); 841 return viewport.getInverseTransformForRotatedImage(this.orientation_);
842 }; 842 };
OLDNEW
« no previous file with comments | « chrome/test/data/extensions/api_test/file_manager_browsertest/gallery/test_util.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698