Page MenuHomePhabricator
Files F15409801

D12758.id30661.diff
No OneTemporary
Actions

D12758.id30661.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -8,7 +8,7 @@
return array(
'names' => array(
'core.pkg.css' => 'ca3f6a60',
- 'core.pkg.js' => 'f6b48b53',
+ 'core.pkg.js' => '9b271e23',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => 'bb338e4b',
'differential.pkg.js' => '895b8d62',
@@ -340,13 +340,13 @@
'rsrc/image/texture/table_header.png' => '5c433037',
'rsrc/image/texture/table_header_hover.png' => '038ec3b9',
'rsrc/image/texture/table_header_tall.png' => 'd56b434f',
- 'rsrc/js/application/aphlict/Aphlict.js' => '30a6303c',
+ 'rsrc/js/application/aphlict/Aphlict.js' => '5359e785',
'rsrc/js/application/aphlict/behavior-aphlict-dropdown.js' => '0323afdd',
'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => 'b1a59974',
'rsrc/js/application/aphlict/behavior-aphlict-status.js' => 'ea681761',
'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
- 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'f8dace3b',
+ 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'c9d4f14d',
'rsrc/js/application/conpherence/behavior-drag-and-drop-photo.js' => 'cf86d16a',
'rsrc/js/application/conpherence/behavior-durable-column.js' => '657c2b50',
'rsrc/js/application/conpherence/behavior-menu.js' => '804b0773',
@@ -513,7 +513,7 @@
'conpherence-menu-css' => 'f389e048',
'conpherence-message-pane-css' => '3150e2a2',
'conpherence-notification-css' => 'd208f806',
- 'conpherence-thread-manager' => 'f8dace3b',
+ 'conpherence-thread-manager' => 'c9d4f14d',
'conpherence-transaction-css' => '25138b7f',
'conpherence-update-css' => '1099a660',
'conpherence-widget-pane-css' => '2af42ebe',
@@ -539,7 +539,7 @@
'herald-test-css' => '778b008e',
'homepage-panel-css' => 'e34bf140',
'inline-comment-summary-css' => 'eb5f8e8c',
- 'javelin-aphlict' => '30a6303c',
+ 'javelin-aphlict' => '5359e785',
'javelin-behavior' => '61cbc29a',
'javelin-behavior-aphlict-dropdown' => '0323afdd',
'javelin-behavior-aphlict-listen' => 'b1a59974',
@@ -1022,13 +1022,6 @@
'javelin-install',
'javelin-event',
),
- '30a6303c' => array(
- 'javelin-install',
- 'javelin-util',
- 'javelin-websocket',
- 'javelin-leader',
- 'javelin-json',
- ),
'316b8fa1' => array(
'javelin-install',
'javelin-typeahead-source',
@@ -1155,6 +1148,13 @@
'javelin-dom',
'javelin-reactor-dom',
),
+ '5359e785' => array(
+ 'javelin-install',
+ 'javelin-util',
+ 'javelin-websocket',
+ 'javelin-leader',
+ 'javelin-json',
+ ),
'54b612ba' => array(
'javelin-color',
'javelin-install',
@@ -1764,6 +1764,16 @@
'javelin-install',
'javelin-util',
),
+ 'c9d4f14d' => array(
+ 'javelin-dom',
+ 'javelin-util',
+ 'javelin-stratcom',
+ 'javelin-install',
+ 'javelin-workflow',
+ 'javelin-router',
+ 'javelin-behavior-device',
+ 'javelin-vector',
+ ),
'ca3f91eb' => array(
'javelin-behavior',
'javelin-dom',
@@ -1987,16 +1997,6 @@
'javelin-util',
'phabricator-busy',
),
- 'f8dace3b' => array(
- 'javelin-dom',
- 'javelin-util',
- 'javelin-stratcom',
- 'javelin-install',
- 'javelin-workflow',
- 'javelin-router',
- 'javelin-behavior-device',
- 'javelin-vector',
- ),
'f9539603' => array(
'javelin-behavior',
'javelin-dom',
diff --git a/webroot/rsrc/js/application/aphlict/Aphlict.js b/webroot/rsrc/js/application/aphlict/Aphlict.js
--- a/webroot/rsrc/js/application/aphlict/Aphlict.js
+++ b/webroot/rsrc/js/application/aphlict/Aphlict.js
@@ -49,6 +49,10 @@
JX.Leader.call(JX.bind(this, this._begin));
},
+ getSubscriptions: function() {
+ return this._subscriptions;
+ },
+
setSubscriptions: function(subscriptions) {
this._subscriptions = subscriptions;
JX.Leader.broadcast(
diff --git a/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js b/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js
--- a/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js
+++ b/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js
@@ -277,10 +277,30 @@
params = this._getParams(params);
var handler = JX.bind(this, function(r) {
+ var client = JX.Aphlict.getInstance();
+ var old_subscriptions = [];
+ if (client) {
+ old_subscriptions = client.getSubscriptions();
+ if (old_subscriptions.indexOf(this._loadedThreadID) > -1) {
+ old_subscriptions.splice(
+ old_subscriptions.indexOf(this._loadedThreadID), 1);
+ }
+ }
this._loadedThreadID = r.threadID;
this._loadedThreadPHID = r.threadPHID;
this._latestTransactionID = r.latestTransactionID;
this._canEditLoadedThread = r.canEdit;
+ if (client) {
+ var new_subscriptions = [];
+ new_subscriptions.push(this._loadedThreadPHID);
+ for (var ii = 0; ii < old_subscriptions.length; ii++) {
+ new_subscriptions.push(old_subscriptions[ii]);
+ }
+
+ // clear all the old subscriptions
+ client.clearSubscriptions(client.getSubscriptions());
+ client.setSubscriptions(new_subscriptions);
+ }
JX.Stratcom.invoke('notification-panel-update', null, {});
this._didLoadThreadCallback(r);

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 20, 5:22 AM (2 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7712602
Default Alt Text
D12758.id30661.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility