PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/0_1_0_fixes' into develop

Browse source
This commit is contained in:
Richard van der Hoff 2016-02-25 17:32:22 +00:00
commit 030b8fe113
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGES.rst Normal file
View file

@ -0,0 +1,9 @@
Changes in matrix-react-sdk v0.1.0 (2016-02-24)
===============================================
* Significant refactor: remove separation between views and controllers
* This release of the react-sdk will require additional components to function.
See https://github.com/vector-im/vector-web for a complete application.
Changes in matrix-react-sdk v0.0.2 (2015-10-28)
===============================================
* Initial release

4
CONTRIBUTING.rst Normal file
View file

@ -0,0 +1,4 @@
Contributing code to The React SDK
==================================
matrix-react-sdk follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst

4
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "matrix-react-sdk", "name": "matrix-react-sdk",
"version": "0.0.2", "version": "0.1.0",
"description": "SDK for matrix.org using React", "description": "SDK for matrix.org using React",
"author": "matrix.org", "author": "matrix.org",
"repository": { "repository": {
@ -28,7 +28,7 @@
"highlight.js": "^8.9.1", "highlight.js": "^8.9.1",
"linkifyjs": "^2.0.0-beta.4", "linkifyjs": "^2.0.0-beta.4",
"marked": "^0.3.5", "marked": "^0.3.5",
"matrix-js-sdk": "https://github.com/matrix-org/matrix-js-sdk.git#develop", "matrix-js-sdk": "^0.4.0",
"optimist": "^0.6.1", "optimist": "^0.6.1",
"q": "^1.4.1", "q": "^1.4.1",
"react": "^0.14.2", "react": "^0.14.2",

4
src/components/views/rooms/RoomList.js
View file

@ -127,7 +127,7 @@ module.exports = React.createClass({
onRoomTimeline: function(ev, room, toStartOfTimeline) { onRoomTimeline: function(ev, room, toStartOfTimeline) {
if (toStartOfTimeline) return; if (toStartOfTimeline) return;
this.refreshRoomList(); this._delayedRefreshRoomList();
}, },
onRoomReceipt: function(receiptEvent, room) { onRoomReceipt: function(receiptEvent, room) {
@ -137,7 +137,7 @@ module.exports = React.createClass({
for (var i = 0; i < receiptKeys.length; ++i) { for (var i = 0; i < receiptKeys.length; ++i) {
var rcpt = receiptEvent.getContent()[receiptKeys[i]]; var rcpt = receiptEvent.getContent()[receiptKeys[i]];
if (rcpt['m.read'] && rcpt['m.read'][MatrixClientPeg.get().credentials.userId]) { if (rcpt['m.read'] && rcpt['m.read'][MatrixClientPeg.get().credentials.userId]) {
this.refreshRoomList(); this._delayedRefreshRoomList();
break; break;
} }
} }