matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00
Code Activity

Merge branch 'release-v0.6.3'

Browse Source
This commit is contained in:
David Baker
2016-10-12 11:27:05 +01:00
parent 892ca56808 6f9c8c3007
commit 09255a52f7
11 changed files with 41252 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/client.js
View File

@@ -2886,6 +2886,9 @@ module.exports.CRYPTO_ENABLED = CRYPTO_ENABLED;
* the server for updates. This may be called multiple times even if the state is
* already ERROR. <i>This is the equivalent of "syncError" in the previous
* API.</i></li>
* <li>RECONNECTING: The sync connedtion has dropped, but not in a way that should
* be considered erroneous.
* </li>
* <li>STOPPED: The client has stopped syncing with server due to stopClient
* being called.
* </li>
@@ -2895,8 +2898,10 @@ module.exports.CRYPTO_ENABLED = CRYPTO_ENABLED;
* +---->STOPPED
* |
* +----->PREPARED -------> SYNCING <--+
* | ^ | |
* null ------+ | +---------------+ |
* | ^ ^ |
* | | | |
* | | V |
* null ------+ | +-RECONNECTING<-+ |
* | | V |
* +------->ERROR ---------------------+
*