diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -11,7 +11,7 @@ 'core.pkg.js' => '07b01d4f', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => '4a93db37', - 'differential.pkg.js' => '2b128f3a', + 'differential.pkg.js' => 'b6c94b63', 'diffusion.pkg.css' => '471bc9eb', 'diffusion.pkg.js' => '077e3ad0', 'maniphest.pkg.css' => 'f88a8402', @@ -434,7 +434,7 @@ 'rsrc/js/application/uiexample/gesture-example.js' => 'f42bb8c6', 'rsrc/js/application/uiexample/notification-example.js' => 'c51a6616', 'rsrc/js/core/Busy.js' => '6453c869', - 'rsrc/js/core/DragAndDropFileUpload.js' => 'ae6abfba', + 'rsrc/js/core/DragAndDropFileUpload.js' => '6c376559', 'rsrc/js/core/DraggableList.js' => '109e2a87', 'rsrc/js/core/FileUpload.js' => 'a4ae61bf', 'rsrc/js/core/Hovercard.js' => '4f344388', @@ -708,7 +708,7 @@ 'phabricator-countdown-css' => '86b7b0a0', 'phabricator-crumbs-view-css' => '7fbf25b8', 'phabricator-dashboard-css' => '22dfc441', - 'phabricator-drag-and-drop-file-upload' => 'ae6abfba', + 'phabricator-drag-and-drop-file-upload' => '6c376559', 'phabricator-draggable-list' => '109e2a87', 'phabricator-fatal-config-template-css' => '25d446d6', 'phabricator-feed-css' => '5cbec787', @@ -1324,6 +1324,15 @@ 0 => 'javelin-install', 1 => 'javelin-util', ), + '6c376559' => + array( + 0 => 'javelin-install', + 1 => 'javelin-util', + 2 => 'javelin-request', + 3 => 'javelin-dom', + 4 => 'javelin-uri', + 5 => 'phabricator-file-upload', + ), '6d3e1947' => array( 0 => 'javelin-behavior', @@ -1656,15 +1665,6 @@ 3 => 'javelin-dom', 4 => 'javelin-vector', ), - 'ae6abfba' => - array( - 0 => 'javelin-install', - 1 => 'javelin-util', - 2 => 'javelin-request', - 3 => 'javelin-dom', - 4 => 'javelin-uri', - 5 => 'phabricator-file-upload', - ), 'b3a4b884' => array( 0 => 'javelin-behavior', diff --git a/webroot/rsrc/js/core/DragAndDropFileUpload.js b/webroot/rsrc/js/core/DragAndDropFileUpload.js --- a/webroot/rsrc/js/core/DragAndDropFileUpload.js +++ b/webroot/rsrc/js/core/DragAndDropFileUpload.js @@ -132,6 +132,10 @@ continue; } this._sendRequest(item.getAsFile()); + + // If the paste has both image and text data, prefer the image. + // This happens when pasting from Numbers on OS X. + e.prevent(); } })); }