Conpherence - fix a typo · recaptime.dev/phorge@441112c

+21 -21

resources/celerity/map.php

··· 352 352 'rsrc/js/application/aphlict/behavior-aphlict-status.js' => 'ea681761', 353 353 'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18', 354 354 'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de', 355 - 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '6a9169bb', 356 - 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'e975bd12', 355 + 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '24561adb', 356 + 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'eedc463c', 357 357 'rsrc/js/application/conpherence/behavior-menu.js' => 'c4151295', 358 358 'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861', 359 359 'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3', ··· 517 517 'conpherence-menu-css' => '9b37a261', 518 518 'conpherence-message-pane-css' => 'e78e9d3c', 519 519 'conpherence-notification-css' => '04a6e10a', 520 - 'conpherence-thread-manager' => '6a9169bb', 520 + 'conpherence-thread-manager' => '24561adb', 521 521 'conpherence-update-css' => '1099a660', 522 522 'conpherence-widget-pane-css' => '9efbfed0', 523 523 'differential-changeset-view-css' => '6a8b172a', ··· 583 583 'javelin-behavior-diffusion-locate-file' => '6d3e1947', 584 584 'javelin-behavior-diffusion-pull-lastmodified' => '2b228192', 585 585 'javelin-behavior-doorkeeper-tag' => 'e5822781', 586 - 'javelin-behavior-durable-column' => 'e975bd12', 586 + 'javelin-behavior-durable-column' => 'eedc463c', 587 587 'javelin-behavior-error-log' => '6882e80a', 588 588 'javelin-behavior-fancy-datepicker' => 'c51ae228', 589 589 'javelin-behavior-global-drag-and-drop' => 'bbdf75ca', ··· 988 988 'javelin-workflow', 989 989 'javelin-util', 990 990 ), 991 + '24561adb' => array( 992 + 'javelin-dom', 993 + 'javelin-util', 994 + 'javelin-stratcom', 995 + 'javelin-install', 996 + 'javelin-workflow', 997 + 'javelin-router', 998 + 'javelin-behavior-device', 999 + 'javelin-vector', 1000 + ), 991 1001 '2818f5ce' => array( 992 1002 'javelin-install', 993 1003 'javelin-util', ··· 1270 1280 '69adf288' => array( 1271 1281 'javelin-install', 1272 1282 ), 1273 - '6a9169bb' => array( 1274 - 'javelin-dom', 1275 - 'javelin-util', 1276 - 'javelin-stratcom', 1277 - 'javelin-install', 1278 - 'javelin-workflow', 1279 - 'javelin-router', 1280 - 'javelin-behavior-device', 1281 - 'javelin-vector', 1282 - ), 1283 1283 '6c2b09a2' => array( 1284 1284 'javelin-install', 1285 1285 'javelin-util', ··· 1893 1893 'javelin-dom', 1894 1894 'phabricator-draggable-list', 1895 1895 ), 1896 - 'e975bd12' => array( 1896 + 'ea681761' => array( 1897 + 'javelin-behavior', 1898 + 'javelin-aphlict', 1899 + 'phabricator-phtize', 1900 + 'javelin-dom', 1901 + ), 1902 + 'eedc463c' => array( 1897 1903 'javelin-behavior', 1898 1904 'javelin-dom', 1899 1905 'javelin-stratcom', ··· 1902 1908 'javelin-quicksand', 1903 1909 'phabricator-keyboard-shortcut', 1904 1910 'conpherence-thread-manager', 1905 - ), 1906 - 'ea681761' => array( 1907 - 'javelin-behavior', 1908 - 'javelin-aphlict', 1909 - 'phabricator-phtize', 1910 - 'javelin-dom', 1911 1911 ), 1912 1912 'efe49472' => array( 1913 1913 'javelin-install',

+12 -21

webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js

··· 175 175 if (r.latest_transaction_id < this._updating.knownID) { 176 176 return false; 177 177 } 178 - // we need to let the update code handle things here 179 - if (r.latest_transaction_id > this._updating.knownID) { 180 - this._updating.knownID = r.latest_transaction_id; 181 - return false; 182 - } 183 178 } 184 179 return true; 180 + }, 181 + 182 + _markUpdated: function(r) { 183 + this._updating.knownID = r.latest_transaction_id; 184 + this._latestTransactionID = r.latest_transaction_id; 185 + JX.Stratcom.invoke('notification-panel-update', null, {}); 185 186 }, 186 187 187 188 _updateThread: function() { ··· 194 195 var workflow = new JX.Workflow(uri) 195 196 .setData(params) 196 197 .setHandler(JX.bind(this, function(r) { 197 - if (this._updating && 198 - this._updating.threadPHID == this._loadedThreadPHID) { 199 - // we have a different, more current update in progress so 200 - // return early 201 - if (r.latest_transaction_id < this._updating.knownID) { 202 - return; 203 - } 198 + if (this._shouldUpdateDOM(r)) { 199 + this._markUpdated(r); 200 + 201 + this._didUpdateThreadCallback(r); 204 202 } 205 - this._updating.knownID = r.latest_transaction_id; 206 - this._latestTransactionID = r.latest_transaction_id; 207 - JX.Stratcom.invoke('notification-panel-update', null, {}); 208 - 209 - this._didUpdateThreadCallback(r); 210 203 })); 211 204 212 205 this.syncWorkflow(workflow, 'finally'); ··· 235 228 .setData(params) 236 229 .setHandler(JX.bind(this, function(r) { 237 230 if (this._shouldUpdateDOM(r)) { 238 - this._latestTransactionID = r.latest_transaction_id; 239 - JX.Stratcom.invoke('notification-panel-update', null, {}); 231 + this._markUpdated(r); 240 232 241 233 this._didUpdateWorkflowCallback(r); 242 234 } ··· 283 275 var workflow = JX.Workflow.newFromForm(form, params, keep_enabled) 284 276 .setHandler(JX.bind(this, function(r) { 285 277 if (this._shouldUpdateDOM(r)) { 286 - this._latestTransactionID = r.latest_transaction_id; 287 - JX.Stratcom.invoke('notification-panel-update', null, {}); 278 + this._markUpdated(r); 288 279 289 280 this._didSendMessageCallback(r); 290 281 }

+1 -1

webroot/rsrc/js/application/conpherence/behavior-durable-column.js

··· 120 120 JX.Stratcom.invoke('notification-panel-close'); 121 121 }); 122 122 threadManager.setDidUpdateWorkflowCallback(function(r) { 123 - var messages = this._getMessagesNode(); 123 + var messages = _getColumnMessagesNode(); 124 124 JX.DOM.appendContent(messages, JX.$H(r.transactions)); 125 125 scrollbar.scrollTo(messages.scrollHeight); 126 126 JX.DOM.setContent(_getColumnTitleNode(), r.conpherence_title);

Configure Feed

Configure Feed