diff --git a/.gitignore b/.gitignore index 9b26ed04f1..949e21b82b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ -node_modules -lib \ No newline at end of file +/node_modules +/lib + +# version file and tarball created by 'npm pack' +/git-revision.txt +/matrix-react-sdk-*.tgz diff --git a/CHANGES.rst b/CHANGES.rst new file mode 100644 index 0000000000..d6c12bbf8e --- /dev/null +++ b/CHANGES.rst @@ -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 diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000000..99025f0e0a --- /dev/null +++ b/CONTRIBUTING.rst @@ -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 diff --git a/jenkins.sh b/jenkins.sh new file mode 100755 index 0000000000..a2f28ffb8f --- /dev/null +++ b/jenkins.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -e + +export NVM_DIR="/home/jenkins/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" +nvm use 4 + +set -x + +# install the version of js-sdk provided to us by jenkins +npm install ./node_modules/matrix-js-sdk-*.tgz + +# install the other dependencies +npm install + +# delete the old tarball, if it exists +rm -f matrix-react-sdk-*.tgz + +# build our tarball +npm pack diff --git a/package.json b/package.json index 37b5eb1ac4..c4ebc9f7ae 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "build": "babel src -d lib --source-maps", "start": "babel src -w -d lib --source-maps", "clean": "rimraf lib", - "prepublish": "npm run build" + "prepublish": "npm run build; git rev-parse HEAD > git-revision.txt" }, "dependencies": { "classnames": "^2.1.2", diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index 07ed450ef2..9a7396097f 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -127,7 +127,7 @@ module.exports = React.createClass({ onRoomTimeline: function(ev, room, toStartOfTimeline) { if (toStartOfTimeline) return; - this.refreshRoomList(); + this._delayedRefreshRoomList(); }, onRoomReceipt: function(receiptEvent, room) { @@ -137,7 +137,7 @@ module.exports = React.createClass({ for (var i = 0; i < receiptKeys.length; ++i) { var rcpt = receiptEvent.getContent()[receiptKeys[i]]; if (rcpt['m.read'] && rcpt['m.read'][MatrixClientPeg.get().credentials.userId]) { - this.refreshRoomList(); + this._delayedRefreshRoomList(); break; } }