Consolidate file pasting code

Summary: Fixes T2861. This used to work but I think I broke it when I made the notification popup thing work. Merge it into the drag-and-drop since 90% of the code is the same anyway.

Test Plan: Pasted files into Chrome and got uploads. This doesn't work in Safari and Firefox; as far as I know it isn't supported in those browers.

Reviewers: blc, btrahan, chad

Reviewed By: btrahan

CC: aran

Maniphest Tasks: T2861

Differential Revision: https://secure.phabricator.com/D5530

Author: epriestley

scripts/celerity_mapper.php

@@ -33,7 +33,6 @@
     'javelin-behavior-refresh-csrf',
     'javelin-behavior-phabricator-watch-anchor',
     'javelin-behavior-phabricator-autofocus',
-    'phabricator-paste-file-upload',
     'phabricator-menu-item',
     'phabricator-dropdown-menu',
     'javelin-behavior-phabricator-oncopy',

webroot/rsrc/js/application/core/DragAndDropFileUpload.js

@@ -28,6 +28,11 @@ JX.install('PhabricatorDragAndDropFileUpload', {
       // TODO: Is there a better capability test for this? This seems okay in
       // Safari, Firefox and Chrome.
 
+      return !!window.FileList;
+    },
+    isPasteSupported : function() {
+      // TODO: Needs to check if event.clipboardData is available.
+      // Works in Chrome, doesn't work in Firefox 10.
       return !!window.FileList;
     }
   },
@@ -109,6 +114,27 @@ JX.install('PhabricatorDragAndDropFileUpload', {
           // Force depth to 0.
           this._updateDepth(-this._depth);
         }));
+
+      if (JX.PhabricatorDragAndDropFileUpload.isPasteSupported()) {
+        JX.DOM.listen(
+          this._node,
+          'paste',
+          null,
+          JX.bind(this, function(e) {
+            var clipboardData = e.getRawEvent().clipboardData;
+            if (!clipboardData) {
+              return;
+            }
+
+            for (var ii = 0; ii < clipboardData.items.length; ii++) {
+              var item = clipboardData.items[ii];
+              if (!/^image\//.test(item.type)) {
+                continue;
+              }
+              this._sendRequest(item.getAsFile());
+            }
+          }));
+      }
     },
     _sendRequest : function(spec) {
       var file = new JX.PhabricatorFileUpload()

webroot/rsrc/js/application/core/PasteFileUpload.js

@@ -3,7 +3,6 @@
  * @requires javelin-behavior
  *           javelin-dom
  *           phabricator-drag-and-drop-file-upload
- *           phabricator-paste-file-upload
  *           phabricator-textareautils
  */
 
@@ -39,12 +38,5 @@ JX.behavior('aphront-drag-and-drop-textarea', function(config) {
     drop.start();
   }
 
-  if (JX.PhabricatorPasteFileUpload.isSupported()) {
-    var paste = new JX.PhabricatorPasteFileUpload(target)
-      .setURI(config.uri);
-    paste.listen('didUpload', onupload);
-    paste.start();
-  }
-
 });