Fixing paste operation in File Browser

chrome/browser/resources/file_manager/js/file_manager.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.
 
 // Setting the src of an img to an empty string can crash the browser, so we
 // use an empty 1x1 gif instead.
 const EMPTY_IMAGE_URI = 'data:image/gif;base64,'
         + 'R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw%3D%3D';
 
 /**
@@ skipping 112 matching lines @@
   /**
    * Return a translated string.
    *
    * Wrapper function to make dealing with translated strings more concise.
    * Equivilant to localStrings.getString(id).
    *
    * @param {string} id The id of the string to return.
    * @return {string} The translated string.
    */
   function str(id) {
-    return localStrings.getString(id);
+    return localStrings.getString(id) || ('UNLOCALIZED STRING ' + id);
   }
 
   /**
    * Return a translated string with arguments replaced.
    *
    * Wrapper function to make dealing with translated strings more concise.
    * Equivilant to localStrings.getStringF(id, ...).
    *
    * @param {string} id The id of the string to return.
    * @param {...string} The values to replace into the string.
@@ skipping 793 matching lines @@
     }
     this.dialogDom_.appendChild(butter);
 
     var self = this;
 
     setTimeout(function () {
       if (self.currentButter_)
         self.hideButter();
 
       self.currentButter_ = butter;
-      self.currentButter_.classList.remove('before-show');
 
       self.updateButter(message, opt_options);
     });
 
     return butter;
   };
 
   FileManager.prototype.showButterError = function(message, opt_options) {
     var butter = this.showButter(message, opt_options);
     butter.classList.add('error');
@@ skipping 11 matching lines @@
       timeout = 10 * 1000;
     }
 
     if (this.butterTimer_)
       clearTimeout(this.butterTimer_);
 
     if (timeout) {
       var self = this;
       this.butterTimer_ = setTimeout(function() {
           self.hideButter();
-          self.butterTimer_ == null;
+          self.butterTimer_ = null;
       }, timeout);
     }
 
     var butter = this.currentButter_;
     butter.querySelector('.butter-message').textContent = message;
-
+    if (message) {
+      // The butter bar is made visible on the first non-empty message.
+      butter.classList.remove('before-show');
+    }
     if (opt_options && 'progress' in opt_options) {
       butter.querySelector('.progress-track').style.width =
           (opt_options.progress*100) + '%';
     }
 
     butter.style.left = ((this.dialogDom_.clientWidth -
                           butter.clientWidth) / 2) + 'px';
   };
 
   FileManager.prototype.hideButter = function() {
     if (this.currentButter_) {
-      this.currentButter_.style.top = '50px';
-      this.currentButter_.style.opacity = '0';
+      this.currentButter_.classList.add('after-show');
 
       var butter = this.currentButter_;
       setTimeout(function() {
           butter.parentNode.removeChild(butter);
       }, 1000);
 
       this.currentButter_ = null;
     }
   };
 
@@ skipping 46 matching lines @@
      *
      * @return {boolean} True if "paste" command can be executed for current
      *                   directory.
      */
 
     var canPaste = false;
     var clipboardCanPaste = function(event) {
       event.preventDefault();
       // Here we need to use lower case as clipboardData.types return lower
       // case DomStringList.
-      if (event.clipboardData.types.contains('fs/iscut'))
+      if (event.clipboardData &&
+          event.clipboardData.types &&
+          event.clipboardData.types.indexOf('fs/iscut') != -1)
          canPaste = true;
     };
 
     this.document_.removeEventListener('paste', this.pasteFromClipboardBind_);
     this.document_.addEventListener('paste', clipboardCanPaste);
     this.document_.execCommand('paste');
     this.document_.removeEventListener('paste', clipboardCanPaste);
     this.document_.addEventListener('paste', this.pasteFromClipboardBind_);
     return canPaste && !readonly;
   };
@@ skipping 1781 matching lines @@
     this.updateCommands_();
     this.blinkSelection();
   };
 
   /**
    * Queue up a file copy operation based on the current system clipboard.
    */
   FileManager.prototype.pasteFromClipboard_ = function(event) {
     event.preventDefault();
 
     if (!event.clipboardData.getData('fs/isCut'))

[dgozman, 2012/03/01 08:28:40]

Do we need similar checks here?

[Vladislav Kaznacheev, 2012/03/01 08:33:02]

For some reason this is not happening.
On 2012/03/01 08:28:40, dgozman wrote:

       return;
 
-    this.showButter(str('PASTE_STARTED'), {timeout: 0});
+    // Pass an empty string so that the butter bar remains invisible until
+    // the first progress update. This prevents the flicker on short operations.
+    this.showButter('', {timeout: 0});
 
     var clipboard = {
       isCut: event.clipboardData.getData('fs/isCut'),
       sourceDir: event.clipboardData.getData('fs/sourcedir'),
       directories: event.clipboardData.getData('fs/directories'),
       files: event.clipboardData.getData('fs/files')
     };
 
     this.copyManager_.paste(clipboard,
                             this.directoryModel_.currentEntry,
@@ skipping 1051 matching lines @@
           });
       }, onError);
 
       function onError(err) {
         console.log('Error while checking free space: ' + err);
         setTimeout(doCheck, 1000 * 60);
       }
     }
   }
 })();