matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

fix lint

Browse Source
This commit is contained in:
Matthew Hodgson
2016-08-31 16:31:49 +01:00
parent b0782885d5
commit c791881c87
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/models/room.js
View File

@@ -1509,7 +1509,8 @@ module.exports = Room;
* added to the end of the live timeline * added to the end of the live timeline
* *
* @example * @example
* matrixClient.on("Room.timeline", function(event, room, toStartOfTimeline, removed, data){ * matrixClient.on("Room.timeline",
* function(event, room, toStartOfTimeline, removed, data) {
* if (!toStartOfTimeline && data.liveEvent) { * if (!toStartOfTimeline && data.liveEvent) {
* var messageToAppend = room.timeline.[room.timeline.length - 1]; * var messageToAppend = room.timeline.[room.timeline.length - 1];
* } * }

6
lib/webrtc/call.js
View File

@@ -74,6 +74,10 @@ MatrixCall.ERR_LOCAL_OFFER_FAILED = "local_offer_failed";
*/ */
MatrixCall.ERR_NO_USER_MEDIA = "no_user_media"; MatrixCall.ERR_NO_USER_MEDIA = "no_user_media";
/**
* Lookup from opaque queue ID to a promise for media element operations that
* need to be serialised into a given queue
*/
MatrixCall.mediaPromises = {}; MatrixCall.mediaPromises = {};
utils.inherits(MatrixCall, EventEmitter); utils.inherits(MatrixCall, EventEmitter);
@@ -990,7 +994,7 @@ var _tryPlayRemoteAudioStream = function(self) {
setTimeout(function() { setTimeout(function() {
var ael = self.getRemoteAudioElement(); var ael = self.getRemoteAudioElement();
if (ael.play) { if (ael.play) {
self.playElement(vel, "remoteAudio"); self.playElement(ael, "remoteAudio");
} }
// OpenWebRTC does not support oniceconnectionstatechange yet // OpenWebRTC does not support oniceconnectionstatechange yet
if (self.webRtc.isOpenWebRTC()) { if (self.webRtc.isOpenWebRTC()) {