;
}
if (this.props.saving) {
- var Spinner = sdk.getComponent("elements.Spinner");
+ const Spinner = sdk.getComponent("elements.Spinner");
spinner =
;
}
- if (can_set_room_name) {
- var RoomNameEditor = sdk.getComponent("rooms.RoomNameEditor");
+ if (canSetRoomName) {
+ const RoomNameEditor = sdk.getComponent("rooms.RoomNameEditor");
name = ;
- }
- else {
- var searchStatus;
+ } else {
// don't display the search count until the search completes and
// gives us a valid (possibly zero) searchCount.
- if (this.props.searchInfo && this.props.searchInfo.searchCount !== undefined && this.props.searchInfo.searchCount !== null) {
- searchStatus = { _t("(~%(count)s results)", { count: this.props.searchInfo.searchCount }) }
;
+ if (this.props.searchInfo &&
+ this.props.searchInfo.searchCount !== undefined &&
+ this.props.searchInfo.searchCount !== null) {
+ searchStatus =
+ { _t("(~%(count)s results)", { count: this.props.searchInfo.searchCount }) }
+
;
}
// XXX: this is a bit inefficient - we could just compare room.name for 'Empty room'...
- var settingsHint = false;
- var members = this.props.room ? this.props.room.getJoinedMembers() : undefined;
+ let settingsHint = false;
+ const members = this.props.room ? this.props.room.getJoinedMembers() : undefined;
if (members) {
if (members.length === 1 && members[0].userId === MatrixClientPeg.get().credentials.userId) {
- var name = this.props.room.currentState.getStateEvents('m.room.name', '');
+ name = this.props.room.currentState.getStateEvents('m.room.name', '');
if (!name || !name.getContent().name) {
settingsHint = true;
}
}
}
- var roomName = _t("Join Room");
+ let roomName = _t("Join Room");
if (this.props.oobData && this.props.oobData.name) {
roomName = this.props.oobData.name;
} else if (this.props.room) {
@@ -243,24 +238,25 @@ module.exports = React.createClass({
;
}
- if (can_set_room_topic) {
- var RoomTopicEditor = sdk.getComponent("rooms.RoomTopicEditor");
- topic_el = ;
+ if (canSetRoomTopic) {
+ const RoomTopicEditor = sdk.getComponent("rooms.RoomTopicEditor");
+ topicElement = ;
} else {
- var topic;
+ let topic;
if (this.props.room) {
- var ev = this.props.room.currentState.getStateEvents('m.room.topic', '');
+ const ev = this.props.room.currentState.getStateEvents('m.room.topic', '');
if (ev) {
topic = ev.getContent().topic;
}
}
if (topic) {
- topic_el = { topic }
;
+ topicElement =
+ { topic }
;
}
}
- var roomAvatar = null;
- if (can_set_room_avatar) {
+ let roomAvatar = null;
+ if (canSetRoomAvatar) {
roomAvatar = (
@@ -276,8 +272,7 @@ module.exports = React.createClass({
);
- }
- else if (this.props.room || (this.props.oobData && this.props.oobData.name)) {
+ } else if (this.props.room || (this.props.oobData && this.props.oobData.name)) {
roomAvatar = (
@@ -285,9 +280,8 @@ module.exports = React.createClass({
);
}
- var settings_button;
if (this.props.onSettingsClick) {
- settings_button =
+ settingsButton =
;
@@ -301,61 +295,58 @@ module.exports = React.createClass({
//
;
// }
- var forget_button;
+ let forgetButton;
if (this.props.onForgetClick) {
- forget_button =
+ forgetButton =
;
}
- let search_button;
+ let searchButton;
if (this.props.onSearchClick && this.props.inRoom) {
- search_button =
+ searchButton =
;
}
- var rightPanel_buttons;
+ let rightPanelButtons;
if (this.props.collapsedRhs) {
- rightPanel_buttons =
+ rightPanelButtons =
;
}
- var right_row;
+ let rightRow;
if (!this.props.editing) {
- right_row =
+ rightRow =
- { settings_button }
- { forget_button }
- { search_button }
- { rightPanel_buttons }
+ { settingsButton }
+ { forgetButton }
+ { searchButton }
+ { rightPanelButtons }
;
}
- header =
-
-
-
- { roomAvatar }
-
-
- { name }
- { topic_el }
-
-
- {spinner}
- {save_button}
- {cancel_button}
- {right_row}
-
- { header }
+
+
+
+ { roomAvatar }
+
+
+ { name }
+ { topicElement }
+
+
+ {spinner}
+ {saveButton}
+ {cancelButton}
+ {rightRow}
+
{_t("Active call (%(roomName)s)", {roomName: callRoom.name})}
@@ -147,6 +144,6 @@ module.exports = React.createClass({
{ voice }
);
- }
+ },
});
diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
index 1b806fc5b3..c5934b74dc 100644
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@@ -13,10 +13,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
-var React = require('react');
-var MatrixClientPeg = require('../../../MatrixClientPeg');
-var dis = require("../../../dispatcher");
-var CallHandler = require("../../../CallHandler");
+import React from 'react';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import dis from '../../../dispatcher';
import { _t } from '../../../languageHandler';
module.exports = React.createClass({
@@ -29,34 +28,32 @@ module.exports = React.createClass({
onAnswerClick: function() {
dis.dispatch({
action: 'answer',
- room_id: this.props.incomingCall.roomId
+ room_id: this.props.incomingCall.roomId,
});
},
onRejectClick: function() {
dis.dispatch({
action: 'hangup',
- room_id: this.props.incomingCall.roomId
+ room_id: this.props.incomingCall.roomId,
});
},
render: function() {
- var room = null;
+ let room = null;
if (this.props.incomingCall) {
room = MatrixClientPeg.get().getRoom(this.props.incomingCall.roomId);
}
- var caller = room ? room.name : _t("unknown caller");
+ const caller = room ? room.name : _t("unknown caller");
let incomingCallText = null;
if (this.props.incomingCall) {
if (this.props.incomingCall.type === "voice") {
incomingCallText = _t("Incoming voice call from %(name)s", {name: caller});
- }
- else if (this.props.incomingCall.type === "video") {
+ } else if (this.props.incomingCall.type === "video") {
incomingCallText = _t("Incoming video call from %(name)s", {name: caller});
- }
- else {
+ } else {
incomingCallText = _t("Incoming call from %(name)s", {name: caller});
}
}
@@ -81,6 +78,6 @@ module.exports = React.createClass({
);
- }
+ },
});
diff --git a/src/components/views/voip/VideoFeed.js b/src/components/views/voip/VideoFeed.js
index 0b8d0b20fc..953dbc866f 100644
--- a/src/components/views/voip/VideoFeed.js
+++ b/src/components/views/voip/VideoFeed.js
@@ -16,7 +16,7 @@ limitations under the License.
'use strict';
-var React = require('react');
+import React from 'react';
module.exports = React.createClass({
displayName: 'VideoFeed',
diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js
index ea37579237..6ebf2078c1 100644
--- a/src/components/views/voip/VideoView.js
+++ b/src/components/views/voip/VideoView.js
@@ -16,11 +16,11 @@ limitations under the License.
'use strict';
-var React = require('react');
-var ReactDOM = require('react-dom');
+import React from 'react';
+import ReactDOM from 'react-dom';
-var sdk = require('../../../index');
-var dis = require('../../../dispatcher');
+import sdk from '../../../index';
+import dis from '../../../dispatcher';
module.exports = React.createClass({
displayName: 'VideoView',
@@ -53,9 +53,10 @@ module.exports = React.createClass({
// this needs to be somewhere at the top of the DOM which
// always exists to avoid audio interruptions.
// Might as well just use DOM.
- var remoteAudioElement = document.getElementById("remoteAudio");
+ const remoteAudioElement = document.getElementById("remoteAudio");
if (!remoteAudioElement) {
- console.error("Failed to find remoteAudio element - cannot play audio! You need to add an to the DOM.");
+ console.error("Failed to find remoteAudio element - cannot play audio!"
+ + "You need to add an to the DOM.");
}
return remoteAudioElement;
},
@@ -70,22 +71,21 @@ module.exports = React.createClass({
onAction: function(payload) {
switch (payload.action) {
- case 'video_fullscreen':
+ case 'video_fullscreen': {
if (!this.container) {
return;
}
- var element = this.container;
+ const element = this.container;
if (payload.fullscreen) {
- var requestMethod = (
+ const requestMethod = (
element.requestFullScreen ||
element.webkitRequestFullScreen ||
element.mozRequestFullScreen ||
element.msRequestFullscreen
);
requestMethod.call(element);
- }
- else {
- var exitMethod = (
+ } else {
+ const exitMethod = (
document.exitFullscreen ||
document.mozCancelFullScreen ||
document.webkitExitFullscreen ||
@@ -96,17 +96,18 @@ module.exports = React.createClass({
}
}
break;
+ }
}
},
render: function() {
- var VideoFeed = sdk.getComponent('voip.VideoFeed');
+ const VideoFeed = sdk.getComponent('voip.VideoFeed');
// if we're fullscreen, we don't want to set a maxHeight on the video element.
- var fullscreenElement = (document.fullscreenElement ||
+ const fullscreenElement = (document.fullscreenElement ||
document.mozFullScreenElement ||
document.webkitFullscreenElement);
- var maxVideoHeight = fullscreenElement ? null : this.props.maxHeight;
+ const maxVideoHeight = fullscreenElement ? null : this.props.maxHeight;
return (
@@ -119,5 +120,5 @@ module.exports = React.createClass({
);
- }
+ },
});
From 827c38d4a5a5cb193017a88742270e6481081d6f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 3 Jul 2017 19:13:07 +0100
Subject: [PATCH 14/14] fix variable clash
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/rooms/RoomHeader.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index ce163003c0..85aedadf64 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -216,8 +216,8 @@ module.exports = React.createClass({
const members = this.props.room ? this.props.room.getJoinedMembers() : undefined;
if (members) {
if (members.length === 1 && members[0].userId === MatrixClientPeg.get().credentials.userId) {
- name = this.props.room.currentState.getStateEvents('m.room.name', '');
- if (!name || !name.getContent().name) {
+ const nameEvent = this.props.room.currentState.getStateEvents('m.room.name', '');
+ if (!nameEvent || !nameEvent.getContent().name) {
settingsHint = true;
}
}