revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-17 01:08:41 +01:00
Code Issues Releases Wiki Activity

Only show loading animation on thread change in Conpherence

Browse source 
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
This commit is contained in:
Chad Little 2016-10-13 19:48:41 -07:00
parent 8247edff98
commit 636eaf231e
2 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
resources/celerity/map.php
View file

@ -8,7 +8,7 @@
return array( return array(
'names' => array( 'names' => array(
'conpherence.pkg.css' => 'c839a862', 'conpherence.pkg.css' => 'c839a862',
'conpherence.pkg.js' => 'b18c9dc5', 'conpherence.pkg.js' => 'cbe4d9be',
'core.pkg.css' => 'b99bbf5e', 'core.pkg.css' => 'b99bbf5e',
'core.pkg.js' => '30185d95', 'core.pkg.js' => '30185d95',
'darkconsole.pkg.js' => 'e7393ebb', 'darkconsole.pkg.js' => 'e7393ebb',
@ -438,7 +438,7 @@ return array(
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2', 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2',
'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '3bc9d2b1', 'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '3bc9d2b1',
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c5238acb', 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c5238acb',
'rsrc/js/application/conpherence/behavior-menu.js' => '0f82ba76', 'rsrc/js/application/conpherence/behavior-menu.js' => '07928ca3',
'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8', 'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8',
'rsrc/js/application/conpherence/behavior-pontificate.js' => 'f2e58483', 'rsrc/js/application/conpherence/behavior-pontificate.js' => 'f2e58483',
'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3', 'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
@ -663,7 +663,7 @@ return array(
'javelin-behavior-choose-control' => '327a00d1', 'javelin-behavior-choose-control' => '327a00d1',
'javelin-behavior-comment-actions' => '0300eae6', 'javelin-behavior-comment-actions' => '0300eae6',
'javelin-behavior-config-reorder-fields' => 'b6993408', 'javelin-behavior-config-reorder-fields' => 'b6993408',
'javelin-behavior-conpherence-menu' => '0f82ba76', 'javelin-behavior-conpherence-menu' => '07928ca3',
'javelin-behavior-conpherence-participant-pane' => '8604caa8', 'javelin-behavior-conpherence-participant-pane' => '8604caa8',
'javelin-behavior-conpherence-pontificate' => 'f2e58483', 'javelin-behavior-conpherence-pontificate' => 'f2e58483',
'javelin-behavior-conpherence-search' => '3bc9d2b1', 'javelin-behavior-conpherence-search' => '3bc9d2b1',
@ -1040,6 +1040,20 @@ return array(
'phabricator-prefab', 'phabricator-prefab',
'phuix-icon-view', 'phuix-icon-view',
), ),
'07928ca3' => array(
'javelin-behavior',
'javelin-dom',
'javelin-util',
'javelin-stratcom',
'javelin-workflow',
'javelin-behavior-device',
'javelin-history',
'javelin-vector',
'javelin-scrollbar',
'phabricator-title',
'phabricator-shaped-request',
'conpherence-thread-manager',
),
'08675c6d' => array( '08675c6d' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-behavior-device', 'javelin-behavior-device',
@ -1072,20 +1086,6 @@ return array(
'javelin-install', 'javelin-install',
'javelin-util', 'javelin-util',
), ),
'0f82ba76' => array(
'javelin-behavior',
'javelin-dom',
'javelin-util',
'javelin-stratcom',
'javelin-workflow',
'javelin-behavior-device',
'javelin-history',
'javelin-vector',
'javelin-scrollbar',
'phabricator-title',
'phabricator-shaped-request',
'conpherence-thread-manager',
),
'116cf19b' => array( '116cf19b' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-stratcom', 'javelin-stratcom',

12
webroot/rsrc/js/application/conpherence/behavior-menu.js
View file

@ -32,7 +32,7 @@ JX.behavior('conpherence-menu', function(config) {
return scrollbar.getContentNode(); return scrollbar.getContentNode();
}); });
threadManager.setWillLoadThreadCallback(function() { threadManager.setWillLoadThreadCallback(function() {
markThreadLoading(true); markThreadsLoading(true);
}); });
threadManager.setDidLoadThreadCallback(function(r) { threadManager.setDidLoadThreadCallback(function(r) {
var header = JX.$H(r.header); var header = JX.$H(r.header);
@ -48,7 +48,7 @@ JX.behavior('conpherence-menu', function(config) {
JX.DOM.setContent(scrollbar.getContentNode(), messages); JX.DOM.setContent(scrollbar.getContentNode(), messages);
JX.DOM.setContent(form_root, form); JX.DOM.setContent(form_root, form);
markThreadLoading(false); markThreadsLoading(false);
didRedrawThread(true); didRedrawThread(true);
}); });
@ -207,15 +207,11 @@ JX.behavior('conpherence-menu', function(config) {
} }
function markThreadsLoading(loading) { function markThreadsLoading(loading) {
var root = JX.DOM.find(document, 'div', 'conpherence-layout'); var root = JX.$('conpherence-main-layout');
var menu = JX.DOM.find(root, 'div', 'conpherence-menu-pane'); JX.DOM.alterClass(root, 'loading', loading);
JX.DOM.alterClass(menu, 'loading', loading);
} }
function markThreadLoading(loading) { function markThreadLoading(loading) {
var root = JX.$('conpherence-main-layout');
JX.DOM.alterClass(root, 'loading', loading);
try { try {
var textarea = JX.DOM.find(form, 'textarea'); var textarea = JX.DOM.find(form, 'textarea');
textarea.disabled = loading; textarea.disabled = loading;