Skip to content

Commit 167eb9a

Browse files
author
Chad Little
committed
Remove Files Widget from Conpherence
Summary: Fixes T8834. Removes everywhere I could find references to Files. Test Plan: Use Conpherence, send a message, attach a file, try durable column, send message, send file. Seems snappy. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Maniphest Tasks: T8834 Differential Revision: https://secure.phabricator.com/D13936
1 parent 9790f93 commit 167eb9a

File tree

8 files changed

+18
-202
lines changed

8 files changed

+18
-202
lines changed

resources/celerity/map.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
'rsrc/css/application/conpherence/notification.css' => '6cdcc253',
5252
'rsrc/css/application/conpherence/transaction.css' => '85d0974c',
5353
'rsrc/css/application/conpherence/update.css' => 'faf6be09',
54-
'rsrc/css/application/conpherence/widget-pane.css' => 'b0793769',
54+
'rsrc/css/application/conpherence/widget-pane.css' => '775eaaba',
5555
'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
5656
'rsrc/css/application/countdown/timer.css' => 'e7544472',
5757
'rsrc/css/application/daemon/bulk-job.css' => 'df9c1d4a',
@@ -346,7 +346,7 @@
346346
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2',
347347
'rsrc/js/application/conpherence/behavior-drag-and-drop-photo.js' => 'cf86d16a',
348348
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c72aa091',
349-
'rsrc/js/application/conpherence/behavior-menu.js' => 'd3782c93',
349+
'rsrc/js/application/conpherence/behavior-menu.js' => '1d45c74d',
350350
'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
351351
'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
352352
'rsrc/js/application/conpherence/behavior-widget-pane.js' => 'a8458711',
@@ -514,7 +514,7 @@
514514
'conpherence-thread-manager' => '01774ab2',
515515
'conpherence-transaction-css' => '85d0974c',
516516
'conpherence-update-css' => 'faf6be09',
517-
'conpherence-widget-pane-css' => 'b0793769',
517+
'conpherence-widget-pane-css' => '775eaaba',
518518
'differential-changeset-view-css' => 'b6b0d1bb',
519519
'differential-core-view-css' => '7ac3cabc',
520520
'differential-inline-comment-editor' => 'd4c87bf4',
@@ -552,7 +552,7 @@
552552
'javelin-behavior-choose-control' => '6153c708',
553553
'javelin-behavior-config-reorder-fields' => 'b6993408',
554554
'javelin-behavior-conpherence-drag-and-drop-photo' => 'cf86d16a',
555-
'javelin-behavior-conpherence-menu' => 'd3782c93',
555+
'javelin-behavior-conpherence-menu' => '1d45c74d',
556556
'javelin-behavior-conpherence-pontificate' => '21ba5861',
557557
'javelin-behavior-conpherence-widget-pane' => 'a8458711',
558558
'javelin-behavior-countdown-timer' => 'e4cc26b3',
@@ -955,6 +955,20 @@
955955
'javelin-dom',
956956
'javelin-vector',
957957
),
958+
'1d45c74d' => array(
959+
'javelin-behavior',
960+
'javelin-dom',
961+
'javelin-util',
962+
'javelin-stratcom',
963+
'javelin-workflow',
964+
'javelin-behavior-device',
965+
'javelin-history',
966+
'javelin-vector',
967+
'javelin-scrollbar',
968+
'phabricator-title',
969+
'phabricator-shaped-request',
970+
'conpherence-thread-manager',
971+
),
958972
'1def2711' => array(
959973
'javelin-install',
960974
'javelin-dom',
@@ -1798,20 +1812,6 @@
17981812
'd254d646' => array(
17991813
'javelin-util',
18001814
),
1801-
'd3782c93' => array(
1802-
'javelin-behavior',
1803-
'javelin-dom',
1804-
'javelin-util',
1805-
'javelin-stratcom',
1806-
'javelin-workflow',
1807-
'javelin-behavior-device',
1808-
'javelin-history',
1809-
'javelin-vector',
1810-
'javelin-scrollbar',
1811-
'phabricator-title',
1812-
'phabricator-shaped-request',
1813-
'conpherence-thread-manager',
1814-
),
18151815
'd4505101' => array(
18161816
'javelin-stratcom',
18171817
'javelin-install',

src/__phutil_library_map__.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@
232232
'ConpherenceDAO' => 'applications/conpherence/storage/ConpherenceDAO.php',
233233
'ConpherenceDurableColumnView' => 'applications/conpherence/view/ConpherenceDurableColumnView.php',
234234
'ConpherenceEditor' => 'applications/conpherence/editor/ConpherenceEditor.php',
235-
'ConpherenceFileWidgetView' => 'applications/conpherence/view/ConpherenceFileWidgetView.php',
236235
'ConpherenceFormDragAndDropUploadControl' => 'applications/conpherence/view/ConpherenceFormDragAndDropUploadControl.php',
237236
'ConpherenceFulltextQuery' => 'applications/conpherence/query/ConpherenceFulltextQuery.php',
238237
'ConpherenceHovercardEventListener' => 'applications/conpherence/events/ConpherenceHovercardEventListener.php',
@@ -3853,7 +3852,6 @@
38533852
'ConpherenceDAO' => 'PhabricatorLiskDAO',
38543853
'ConpherenceDurableColumnView' => 'AphrontTagView',
38553854
'ConpherenceEditor' => 'PhabricatorApplicationTransactionEditor',
3856-
'ConpherenceFileWidgetView' => 'ConpherenceWidgetView',
38573855
'ConpherenceFormDragAndDropUploadControl' => 'AphrontFormControl',
38583856
'ConpherenceFulltextQuery' => 'PhabricatorOffsetPagedQuery',
38593857
'ConpherenceHovercardEventListener' => 'PhabricatorEventListener',

src/applications/conpherence/constants/ConpherenceWidgetConfigConstants.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ public static function getWidgetRegistry() {
3030
'customHref' => null,
3131
),
3232
),
33-
'widgets-files' => array(
34-
'name' => pht('Files'),
35-
'icon' => 'fa-files-o',
36-
'deviceOnly' => false,
37-
'hasCreate' => false,
38-
),
3933
'widgets-settings' => array(
4034
'name' => pht('Notifications'),
4135
'icon' => 'fa-wrench',

src/applications/conpherence/controller/ConpherenceUpdateController.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -524,13 +524,6 @@ private function loadAndRenderUpdates(
524524
->renderSingleThread($conpherence, $policy_objects);
525525
$nav_item = hsprintf('%s', $nav_item);
526526
break;
527-
case ConpherenceUpdateActions::MESSAGE:
528-
$file_widget = id(new ConpherenceFileWidgetView())
529-
->setUser($this->getRequest()->getUser())
530-
->setConpherence($conpherence)
531-
->setUpdateURI($widget_uri);
532-
$file_widget = hsprintf('%s', $file_widget->render());
533-
break;
534527
case ConpherenceUpdateActions::ADD_PERSON:
535528
$people_widget = id(new ConpherencePeopleWidgetView())
536529
->setUser($user)

src/applications/conpherence/controller/ConpherenceWidgetController.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ public function handleRequest(AphrontRequest $request) {
4141
case 'widgets-people':
4242
$content = $this->renderPeopleWidgetPaneContent();
4343
break;
44-
case 'widgets-files':
45-
$content = $this->renderFileWidgetPaneContent();
46-
break;
4744
case 'widgets-settings':
4845
$content = $this->renderSettingsWidgetPaneContent();
4946
break;
@@ -90,15 +87,6 @@ private function renderWidgetPaneContent() {
9087
'sigil' => 'widgets-people',
9188
),
9289
$this->renderPeopleWidgetPaneContent());
93-
$widgets[] = javelin_tag(
94-
'div',
95-
array(
96-
'class' => 'widgets-body',
97-
'id' => 'widgets-files',
98-
'sigil' => 'widgets-files',
99-
'style' => 'display: none;',
100-
),
101-
$this->renderFileWidgetPaneContent());
10290
$widgets[] = phutil_tag(
10391
'div',
10492
array(
@@ -127,12 +115,6 @@ private function renderPeopleWidgetPaneContent() {
127115
->setUpdateURI($this->getWidgetURI());
128116
}
129117

130-
private function renderFileWidgetPaneContent() {
131-
return id(new ConpherenceFileWidgetView())
132-
->setUser($this->getViewer())
133-
->setConpherence($this->getConpherence())
134-
->setUpdateURI($this->getWidgetURI());
135-
}
136118

137119
private function renderSettingsWidgetPaneContent() {
138120
$viewer = $this->getViewer();

src/applications/conpherence/view/ConpherenceFileWidgetView.php

Lines changed: 0 additions & 76 deletions
This file was deleted.

webroot/rsrc/css/application/conpherence/widget-pane.css

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -95,69 +95,6 @@
9595
top: 142px;
9696
}
9797

98-
/* files widget */
99-
100-
.conpherence-widget-pane #widgets-files .no-files {
101-
width: 200px;
102-
padding: 20px;
103-
text-align: center;
104-
color: {$greytext};
105-
}
106-
107-
.device .conpherence-widget-pane #widgets-files .no-files {
108-
width: 60px;
109-
margin: 0 auto 0 auto;
110-
}
111-
112-
.conpherence-widget-pane #widgets-files .file-entry {
113-
padding: 8px 0;
114-
margin: 0 4px 0 8px;
115-
border-bottom: 1px solid {$thinblueborder};
116-
}
117-
118-
.conpherence-widget-pane #widgets-files .file-entry a {
119-
color: {$darkbluetext};
120-
font-weight: bold;
121-
}
122-
123-
.conpherence-widget-pane #widgets-files .file-icon {
124-
width: 32px;
125-
height: 32px;
126-
float: left;
127-
font-size: 24px;
128-
color: {$blue};
129-
margin: 2px 0 2px 4px;
130-
}
131-
132-
.conpherence-widget-pane #widgets-files .file-title {
133-
display: block;
134-
position: relative;
135-
top: -4px;
136-
left: 0;
137-
overflow-x: hidden;
138-
width: 180px;
139-
font-weight: bold;
140-
text-overflow: ellipsis;
141-
white-space: nowrap;
142-
}
143-
.conpherence-widget-pane #widgets-files .file-uploaded-by {
144-
color: {$lightgreytext};
145-
position: relative;
146-
top: 0;
147-
left: 0;
148-
width: 180px;
149-
font-size: {$smallestfontsize};
150-
}
151-
152-
.device .conpherence-widget-pane #widgets-files .file-title,
153-
.device .conpherence-widget-pane #widgets-files .file-uploaded-by {
154-
width: 82%;
155-
}
156-
.device .conpherence-widget-pane #widgets-files .divider {
157-
width: 80%;
158-
margin: 8px 0px 0px 10%;
159-
}
160-
16198
.conpherence-widget-pane .widget-icon {
16299
display: block;
163100
height: 14px;

webroot/rsrc/js/application/conpherence/behavior-menu.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,6 @@ JX.behavior('conpherence-menu', function(config) {
6666
var form_root = JX.DOM.find(root, 'div', 'conpherence-form');
6767
var textarea = JX.DOM.find(form_root, 'textarea');
6868
if (!non_update) {
69-
var fileWidget = null;
70-
try {
71-
fileWidget = JX.DOM.find(root, 'div', 'widgets-files');
72-
} catch (ex) {
73-
// Ignore; maybe no files widget
74-
}
75-
if (fileWidget) {
76-
JX.DOM.setContent(
77-
fileWidget,
78-
JX.$H(r.file_widget));
79-
}
80-
8169
_scrollMessageWindow();
8270
textarea.value = '';
8371
}

0 commit comments

Comments
 (0)