From 4d3bb6eb3438fab3393df2487ee69ed08cf97121 Mon Sep 17 00:00:00 2001 From: Bob Trahan Date: Thu, 12 Mar 2015 16:04:43 -0700 Subject: [PATCH] Conpherence - tweak global upload + durable conpherence interaction Summary: Ref T7539. This stuff is pretty whack - the "dragEnter" and "dragLeave" fire over and over and over despite not moving the mouse sometimes from JX.Mask interaction, causing that neat flickering effect. Fix this mess by disabling pointer events for the mask. Test Plan: dragged a file to the durable column textarea. it uploaded and inlined the Fxxx into the message. tried uploading a few times and it worked repeatedly. Reviewers: epriestley, chad Reviewed By: epriestley Subscribers: Korvin, epriestley Maniphest Tasks: T7539 Differential Revision: https://secure.phabricator.com/D12058 --- resources/celerity/map.php | 4 ++-- webroot/rsrc/css/application/conpherence/durable-column.css | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 0ffb6fce43..8fe29db8e2 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -44,7 +44,7 @@ return array( 'rsrc/css/application/config/config-welcome.css' => '6abd79be', 'rsrc/css/application/config/setup-issue.css' => '22270af2', 'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2', - 'rsrc/css/application/conpherence/durable-column.css' => 'ddd4e599', + 'rsrc/css/application/conpherence/durable-column.css' => '0182fe85', 'rsrc/css/application/conpherence/menu.css' => 'c6ac5299', 'rsrc/css/application/conpherence/message-pane.css' => '5930260a', 'rsrc/css/application/conpherence/notification.css' => '04a6e10a', @@ -514,7 +514,7 @@ return array( 'changeset-view-manager' => '88be0133', 'config-options-css' => '7fedf08b', 'config-welcome-css' => '6abd79be', - 'conpherence-durable-column-view' => 'ddd4e599', + 'conpherence-durable-column-view' => '0182fe85', 'conpherence-menu-css' => 'c6ac5299', 'conpherence-message-pane-css' => '5930260a', 'conpherence-notification-css' => '04a6e10a', diff --git a/webroot/rsrc/css/application/conpherence/durable-column.css b/webroot/rsrc/css/application/conpherence/durable-column.css index 2e41f6b3b3..f9b01dd4cd 100644 --- a/webroot/rsrc/css/application/conpherence/durable-column.css +++ b/webroot/rsrc/css/application/conpherence/durable-column.css @@ -14,6 +14,7 @@ .with-durable-column .global-upload-mask { right: 300px; + pointer-events: none; } .conpherence-durable-column {