Fixed the editing of previously edited files

chrome/browser/resources/file_manager/js/image_editor/gallery.js

 // Copyright (c) 2011 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.
 
 /*
  * Base class that Ribbon uses to display photos.
  */
 
 function RibbonClient() {}
 
@@ skipping 855 matching lines @@
   if (!this.original_)
     return name;
 
   var ext = '';
   var index = name.lastIndexOf('.');
   if (index != -1) {
     ext = name.substr(index);
     name = name.substr(0, index);
   }
 
-  if (name.indexOf(Ribbon.Item.COPY_SIGNATURE) == 0) {
-    // TODO(dgozman): add a number to form 'Copy (X) of File.jpg'.
-    name = name.substr(Ribbon.Item.COPY_SIGNATURE.length);
+  var regExpCopyN =
+      new RegExp('^' + Ribbon.Item.COPY_SIGNATURE + '(.+) \\((\\d+)\\)$');

[dgozman, 2011/12/07 06:02:09]

You can extract regExp constants and place them near COPY_SIGNATURE.

[Vladislav Kaznacheev, 2011/12/07 13:11:14]

Done.

+  var match = regExpCopyN.exec(name);
+  if (match && match[1] && match[2]) {
+    var copyNumber = parseInt(match[2], 10) + 1;
+    name = match[1] + ' (' + copyNumber + ')';
+  } else {
+    var regExpCopy0 =
+        new RegExp('^' + Ribbon.Item.COPY_SIGNATURE + '(.+)$');
+    match = regExpCopy0.exec(name);
+    if (match && match[1]) {
+      name = match[1] + ' (1)';
+    }
   }
 
   var mimeType = this.metadata_.mimeType.toLowerCase();
   if (mimeType != 'image/jpeg') {
     // Chrome can natively encode only two formats: JPEG and PNG.
     // All non-JPEG images are saved in PNG, hence forcing the file extension.
-    if (mimeType == 'image/png') {
-      ext = '.png';
-    } else {
-      // All non-JPEG images get 'image/png' mimeType (see
-      // ImageEncoder.MetadataEncoder constructor).
-      // This code can be reached only if someone has added a metadata parser
-      // for a format other than JPEG or PNG. The message below is to remind
-      // that one must also come up with the way to encode the image data.
-      console.error('Image encoding for ' + mimeType + ' is not supported');
-    }
+    ext = '.png';
   }
 
   return Ribbon.Item.COPY_SIGNATURE + name + ext;
 };
 
 Ribbon.Item.prototype.setCopyName = function(opt_name) {
   if (opt_name) {
     this.copyName_ = opt_name;
   } else {
     this.copyName_ = this.createCopyName_();
@@ skipping 156 matching lines @@
 ShareMode.prototype.setUp = function() {
   ImageEditor.Mode.prototype.setUp.apply(this, arguments);
   ImageUtil.setAttribute(this.menu_, 'hidden', false);
   ImageUtil.setAttribute(this.button_, 'pressed', false);
 };
 
 ShareMode.prototype.cleanUpUI = function() {
   ImageEditor.Mode.prototype.cleanUpUI.apply(this, arguments);
   ImageUtil.setAttribute(this.menu_, 'hidden', true);
 };