1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-20 04:20:55 +01:00

Don't revert Conpherence page titles when updating notifications

Summary: Fixes T7709. `JX.Title` deals with adding `(1)`, etc., counts, so send updates through it.

Test Plan: Clicked between some threads in Conpherence, no title flickering.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T7709

Differential Revision: https://secure.phabricator.com/D12260
This commit is contained in:
epriestley 2015-04-02 13:41:48 -07:00
parent a804f0ab93
commit 2ecdbbec10
3 changed files with 30 additions and 22 deletions

View file

@ -8,7 +8,7 @@
return array( return array(
'names' => array( 'names' => array(
'core.pkg.css' => '559c85eb', 'core.pkg.css' => '559c85eb',
'core.pkg.js' => '6be6b2fa', 'core.pkg.js' => '6a4f677f',
'darkconsole.pkg.js' => '8ab24e01', 'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '3500921f', 'differential.pkg.css' => '3500921f',
'differential.pkg.js' => 'c0506961', 'differential.pkg.js' => 'c0506961',
@ -355,7 +355,7 @@ return array(
'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de', 'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'bb928342', 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'bb928342',
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'a0216452', 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'a0216452',
'rsrc/js/application/conpherence/behavior-menu.js' => 'cda6de80', 'rsrc/js/application/conpherence/behavior-menu.js' => 'db6c0ba7',
'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861', 'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3', 'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
'rsrc/js/application/conpherence/behavior-widget-pane.js' => '1ec93bcf', 'rsrc/js/application/conpherence/behavior-widget-pane.js' => '1ec93bcf',
@ -449,7 +449,7 @@ return array(
'rsrc/js/core/Prefab.js' => '72da38cc', 'rsrc/js/core/Prefab.js' => '72da38cc',
'rsrc/js/core/ShapedRequest.js' => '7cbe244b', 'rsrc/js/core/ShapedRequest.js' => '7cbe244b',
'rsrc/js/core/TextAreaUtils.js' => '5c93c52c', 'rsrc/js/core/TextAreaUtils.js' => '5c93c52c',
'rsrc/js/core/Title.js' => '5c1c758c', 'rsrc/js/core/Title.js' => 'df5e11d2',
'rsrc/js/core/ToolTip.js' => '1d298e3a', 'rsrc/js/core/ToolTip.js' => '1d298e3a',
'rsrc/js/core/behavior-active-nav.js' => 'e379b58e', 'rsrc/js/core/behavior-active-nav.js' => 'e379b58e',
'rsrc/js/core/behavior-audio-source.js' => '59b251eb', 'rsrc/js/core/behavior-audio-source.js' => '59b251eb',
@ -557,7 +557,7 @@ return array(
'javelin-behavior-boards-dropdown' => '0ec56e1d', 'javelin-behavior-boards-dropdown' => '0ec56e1d',
'javelin-behavior-choose-control' => '6153c708', 'javelin-behavior-choose-control' => '6153c708',
'javelin-behavior-config-reorder-fields' => '14a827de', 'javelin-behavior-config-reorder-fields' => '14a827de',
'javelin-behavior-conpherence-menu' => 'cda6de80', 'javelin-behavior-conpherence-menu' => 'db6c0ba7',
'javelin-behavior-conpherence-pontificate' => '21ba5861', 'javelin-behavior-conpherence-pontificate' => '21ba5861',
'javelin-behavior-conpherence-widget-pane' => '1ec93bcf', 'javelin-behavior-conpherence-widget-pane' => '1ec93bcf',
'javelin-behavior-countdown-timer' => 'e4cc26b3', 'javelin-behavior-countdown-timer' => 'e4cc26b3',
@ -746,7 +746,7 @@ return array(
'phabricator-source-code-view-css' => '2ceee894', 'phabricator-source-code-view-css' => '2ceee894',
'phabricator-standard-page-view' => 'd2a6518d', 'phabricator-standard-page-view' => 'd2a6518d',
'phabricator-textareautils' => '5c93c52c', 'phabricator-textareautils' => '5c93c52c',
'phabricator-title' => '5c1c758c', 'phabricator-title' => 'df5e11d2',
'phabricator-tooltip' => '1d298e3a', 'phabricator-tooltip' => '1d298e3a',
'phabricator-transaction-view-css' => 'bd9f9f6e', 'phabricator-transaction-view-css' => 'bd9f9f6e',
'phabricator-ui-example-css' => '528b19de', 'phabricator-ui-example-css' => '528b19de',
@ -1215,9 +1215,6 @@ return array(
'javelin-uri', 'javelin-uri',
'javelin-routable', 'javelin-routable',
), ),
'5c1c758c' => array(
'javelin-install',
),
'5c54cbf3' => array( '5c54cbf3' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-stratcom', 'javelin-stratcom',
@ -1760,18 +1757,6 @@ return array(
'javelin-stratcom', 'javelin-stratcom',
'phabricator-phtize', 'phabricator-phtize',
), ),
'cda6de80' => array(
'javelin-behavior',
'javelin-dom',
'javelin-util',
'javelin-stratcom',
'javelin-workflow',
'javelin-behavior-device',
'javelin-history',
'javelin-vector',
'phabricator-shaped-request',
'conpherence-thread-manager',
),
'd19198c8' => array( 'd19198c8' => array(
'javelin-install', 'javelin-install',
'javelin-dom', 'javelin-dom',
@ -1811,6 +1796,19 @@ return array(
'javelin-util', 'javelin-util',
'phabricator-shaped-request', 'phabricator-shaped-request',
), ),
'db6c0ba7' => array(
'javelin-behavior',
'javelin-dom',
'javelin-util',
'javelin-stratcom',
'javelin-workflow',
'javelin-behavior-device',
'javelin-history',
'javelin-vector',
'phabricator-title',
'phabricator-shaped-request',
'conpherence-thread-manager',
),
'dbbf48b6' => array( 'dbbf48b6' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-stratcom', 'javelin-stratcom',
@ -1824,6 +1822,9 @@ return array(
'javelin-typeahead-ondemand-source', 'javelin-typeahead-ondemand-source',
'javelin-dom', 'javelin-dom',
), ),
'df5e11d2' => array(
'javelin-install',
),
'e10f8e18' => array( 'e10f8e18' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-dom', 'javelin-dom',

View file

@ -8,6 +8,7 @@
* javelin-behavior-device * javelin-behavior-device
* javelin-history * javelin-history
* javelin-vector * javelin-vector
* phabricator-title
* phabricator-shaped-request * phabricator-shaped-request
* conpherence-thread-manager * conpherence-thread-manager
*/ */
@ -151,10 +152,10 @@ JX.behavior('conpherence-menu', function(config) {
} }
JX.History.replace(config.baseURI + uri_suffix); JX.History.replace(config.baseURI + uri_suffix);
if (data.title) { if (data.title) {
document.title = data.title; JX.Title.setTitle(data.title);
} else if (_thread.node) { } else if (_thread.node) {
var threadData = JX.Stratcom.getData(_thread.node); var threadData = JX.Stratcom.getData(_thread.node);
document.title = threadData.title; JX.Title.setTitle(threadData.title);
} }
} }

View file

@ -18,6 +18,12 @@ JX.install('Title', {
self._update(); self._update();
}, },
setTitle: function(title) {
var self = JX.Title;
self._title = title;
self._update();
},
_update: function() { _update: function() {
var self = JX.Title; var self = JX.Title;