recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Only show loading animation on thread change in Conpherence

Summary: Fixes the send on enter flash, only uses the `Threads` loading animation on changing threads, not sending a message.

Test Plan: Change threads, post a message.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

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

Chad Little 636eaf23 8247edff

+21 -25
+17 -17
resources/celerity/map.php
··· 8 8 return array( 9 9 'names' => array( 10 10 'conpherence.pkg.css' => 'c839a862', 11 - 'conpherence.pkg.js' => 'b18c9dc5', 11 + 'conpherence.pkg.js' => 'cbe4d9be', 12 12 'core.pkg.css' => 'b99bbf5e', 13 13 'core.pkg.js' => '30185d95', 14 14 'darkconsole.pkg.js' => 'e7393ebb', ··· 438 438 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2', 439 439 'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '3bc9d2b1', 440 440 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c5238acb', 441 - 'rsrc/js/application/conpherence/behavior-menu.js' => '0f82ba76', 441 + 'rsrc/js/application/conpherence/behavior-menu.js' => '07928ca3', 442 442 'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8', 443 443 'rsrc/js/application/conpherence/behavior-pontificate.js' => 'f2e58483', 444 444 'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3', ··· 663 663 'javelin-behavior-choose-control' => '327a00d1', 664 664 'javelin-behavior-comment-actions' => '0300eae6', 665 665 'javelin-behavior-config-reorder-fields' => 'b6993408', 666 - 'javelin-behavior-conpherence-menu' => '0f82ba76', 666 + 'javelin-behavior-conpherence-menu' => '07928ca3', 667 667 'javelin-behavior-conpherence-participant-pane' => '8604caa8', 668 668 'javelin-behavior-conpherence-pontificate' => 'f2e58483', 669 669 'javelin-behavior-conpherence-search' => '3bc9d2b1', ··· 1040 1040 'phabricator-prefab', 1041 1041 'phuix-icon-view', 1042 1042 ), 1043 + '07928ca3' => array( 1044 + 'javelin-behavior', 1045 + 'javelin-dom', 1046 + 'javelin-util', 1047 + 'javelin-stratcom', 1048 + 'javelin-workflow', 1049 + 'javelin-behavior-device', 1050 + 'javelin-history', 1051 + 'javelin-vector', 1052 + 'javelin-scrollbar', 1053 + 'phabricator-title', 1054 + 'phabricator-shaped-request', 1055 + 'conpherence-thread-manager', 1056 + ), 1043 1057 '08675c6d' => array( 1044 1058 'javelin-behavior', 1045 1059 'javelin-behavior-device', ··· 1071 1085 '0f764c35' => array( 1072 1086 'javelin-install', 1073 1087 'javelin-util', 1074 - ), 1075 - '0f82ba76' => array( 1076 - 'javelin-behavior', 1077 - 'javelin-dom', 1078 - 'javelin-util', 1079 - 'javelin-stratcom', 1080 - 'javelin-workflow', 1081 - 'javelin-behavior-device', 1082 - 'javelin-history', 1083 - 'javelin-vector', 1084 - 'javelin-scrollbar', 1085 - 'phabricator-title', 1086 - 'phabricator-shaped-request', 1087 - 'conpherence-thread-manager', 1088 1088 ), 1089 1089 '116cf19b' => array( 1090 1090 'javelin-behavior',
+4 -8
webroot/rsrc/js/application/conpherence/behavior-menu.js
··· 32 32 return scrollbar.getContentNode(); 33 33 }); 34 34 threadManager.setWillLoadThreadCallback(function() { 35 - markThreadLoading(true); 35 + markThreadsLoading(true); 36 36 }); 37 37 threadManager.setDidLoadThreadCallback(function(r) { 38 38 var header = JX.$H(r.header); ··· 48 48 JX.DOM.setContent(scrollbar.getContentNode(), messages); 49 49 JX.DOM.setContent(form_root, form); 50 50 51 - markThreadLoading(false); 51 + markThreadsLoading(false); 52 52 53 53 didRedrawThread(true); 54 54 }); ··· 207 207 } 208 208 209 209 function markThreadsLoading(loading) { 210 - var root = JX.DOM.find(document, 'div', 'conpherence-layout'); 211 - var menu = JX.DOM.find(root, 'div', 'conpherence-menu-pane'); 212 - JX.DOM.alterClass(menu, 'loading', loading); 213 - } 214 - 215 - function markThreadLoading(loading) { 216 210 var root = JX.$('conpherence-main-layout'); 217 211 JX.DOM.alterClass(root, 'loading', loading); 212 + } 218 213 214 + function markThreadLoading(loading) { 219 215 try { 220 216 var textarea = JX.DOM.find(form, 'textarea'); 221 217 textarea.disabled = loading;