Skip to content

Commit 2ccd881

Browse files
ara4nara4n
committed
port to react 0.14, removing getDOMNode()s for DOM components and turning them into ReactDOM.findDOMNode()s for React components
1 parent 87bb7c9 commit 2ccd881

File tree

16 files changed

+48
-46
lines changed

16 files changed

+48
-46
lines changed

‎src/controllers/organisms/RoomList.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
'use strict';
1818

1919
var React = require("react");
20+
var ReactDOM = require("react-dom");
2021
var MatrixClientPeg = require("matrix-react-sdk/lib/MatrixClientPeg");
2122
var RoomListSorter = require("matrix-react-sdk/lib/RoomListSorter");
2223
var dis = require("matrix-react-sdk/lib/dispatcher");
@@ -192,8 +193,8 @@ module.exports = {
192193

193194
_repositionTooltip: function(e) {
194195
if (this.tooltip && this.tooltip.parentElement) {
195-
var scroll = this;
196-
this.tooltip.style.top = (scroll.parentElement.offsetTop + this.tooltip.parentElement.offsetTop - this.scrollTop) + "px";
196+
var scroll = ReactDOM.findDOMNode(this);
197+
this.tooltip.style.top = (scroll.parentElement.offsetTop + this.tooltip.parentElement.offsetTop - scroll.scrollTop) + "px";
197198
}
198199
},
199200
};

‎src/controllers/organisms/RoomView.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ module.exports = {
6060

6161
componentWillUnmount: function() {
6262
if (this.refs.messageWrapper) {
63-
var messageWrapper = this.refs.messageWrapper.getDOMNode();
63+
var messageWrapper = this.refs.messageWrapper;
6464
messageWrapper.removeEventListener('drop', this.onDrop);
6565
messageWrapper.removeEventListener('dragover', this.onDragOver);
6666
messageWrapper.removeEventListener('dragleave', this.onDragLeaveOrEnd);
@@ -99,7 +99,6 @@ module.exports = {
9999
// scroll to bottom
100100
var messageWrapper = this.refs.messageWrapper;
101101
if (messageWrapper) {
102-
messageWrapper = messageWrapper.getDOMNode();
103102
messageWrapper.scrollTop = messageWrapper.scrollHeight;
104103
}
105104
}
@@ -138,7 +137,7 @@ module.exports = {
138137
if (room.roomId != this.props.roomId) return;
139138

140139
if (this.refs.messageWrapper) {
141-
var messageWrapper = this.refs.messageWrapper.getDOMNode();
140+
var messageWrapper = this.refs.messageWrapper;
142141
this.atBottom = (
143142
messageWrapper.scrollHeight - messageWrapper.scrollTop <=
144143
(messageWrapper.clientHeight + 150)
@@ -225,7 +224,7 @@ module.exports = {
225224

226225
componentDidMount: function() {
227226
if (this.refs.messageWrapper) {
228-
var messageWrapper = this.refs.messageWrapper.getDOMNode();
227+
var messageWrapper = this.refs.messageWrapper;
229228

230229
messageWrapper.addEventListener('drop', this.onDrop);
231230
messageWrapper.addEventListener('dragover', this.onDragOver);
@@ -243,7 +242,7 @@ module.exports = {
243242
componentDidUpdate: function() {
244243
if (!this.refs.messageWrapper) return;
245244

246-
var messageWrapper = this.refs.messageWrapper.getDOMNode();
245+
var messageWrapper = this.refs.messageWrapper;
247246

248247
if (this.state.paginating && !this.waiting_for_paginate) {
249248
var heightGained = messageWrapper.scrollHeight - this.oldScrollHeight;
@@ -262,7 +261,7 @@ module.exports = {
262261

263262
fillSpace: function() {
264263
if (!this.refs.messageWrapper) return;
265-
var messageWrapper = this.refs.messageWrapper.getDOMNode();
264+
var messageWrapper = this.refs.messageWrapper;
266265
if (messageWrapper.scrollTop < messageWrapper.clientHeight && this.state.room.oldState.paginationToken) {
267266
this.setState({paginating: true});
268267

@@ -320,7 +319,7 @@ module.exports = {
320319

321320
onMessageListScroll: function(ev) {
322321
if (this.refs.messageWrapper) {
323-
var messageWrapper = this.refs.messageWrapper.getDOMNode();
322+
var messageWrapper = this.refs.messageWrapper;
324323
var wasAtBottom = this.atBottom;
325324
this.atBottom = messageWrapper.scrollHeight - messageWrapper.scrollTop <= messageWrapper.clientHeight;
326325
if (this.atBottom && !wasAtBottom) {

‎src/skins/vector/views/molecules/ChangePassword.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ module.exports = React.createClass({
2727
mixins: [ChangePasswordController],
2828

2929
onClickChange: function() {
30-
var old_password = this.refs.old_input.getDOMNode().value;
31-
var new_password = this.refs.new_input.getDOMNode().value;
32-
var confirm_password = this.refs.confirm_input.getDOMNode().value;
30+
var old_password = this.refs.old_input.value;
31+
var new_password = this.refs.new_input.value;
32+
var confirm_password = this.refs.confirm_input.value;
3333
if (new_password != confirm_password) {
3434
this.setState({
3535
state: this.Phases.Error,

‎src/skins/vector/views/molecules/MessageComposer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module.exports = React.createClass({
2929
mixins: [MessageComposerController],
3030

3131
onUploadClick: function(ev) {
32-
this.refs.uploadInput.getDOMNode().click();
32+
this.refs.uploadInput.click();
3333
},
3434

3535
onUploadFileSelected: function(ev) {
@@ -38,7 +38,7 @@ module.exports = React.createClass({
3838
if (files && files.length > 0) {
3939
this.props.uploadFile(files[0]);
4040
}
41-
this.refs.uploadInput.getDOMNode().value = null;
41+
this.refs.uploadInput.value = null;
4242
},
4343

4444
onCallClick: function(ev) {

‎src/skins/vector/views/molecules/RoomHeader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module.exports = React.createClass({
3535
},
3636

3737
getRoomName: function() {
38-
return this.refs.name_edit.getDOMNode().value;
38+
return this.refs.name_edit.value;
3939
},
4040

4141
onFullscreenClick: function() {

‎src/skins/vector/views/molecules/RoomSettings.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ module.exports = React.createClass({
2727
mixins: [RoomSettingsController],
2828

2929
getTopic: function() {
30-
return this.refs.topic.getDOMNode().value;
30+
return this.refs.topic.value;
3131
},
3232

3333
getJoinRules: function() {
34-
return this.refs.is_private.getDOMNode().checked ? "invite" : "public";
34+
return this.refs.is_private.checked ? "invite" : "public";
3535
},
3636

3737
getHistoryVisibility: function() {
38-
return this.refs.share_history.getDOMNode().checked ? "shared" : "invited";
38+
return this.refs.share_history.checked ? "shared" : "invited";
3939
},
4040

4141
getPowerLevels: function() {
@@ -45,13 +45,13 @@ module.exports = React.createClass({
4545
power_levels = power_levels.getContent();
4646

4747
var new_power_levels = {
48-
ban: parseInt(this.refs.ban.getDOMNode().value),
49-
kick: parseInt(this.refs.kick.getDOMNode().value),
50-
redact: parseInt(this.refs.redact.getDOMNode().value),
51-
invite: parseInt(this.refs.invite.getDOMNode().value),
52-
events_default: parseInt(this.refs.events_default.getDOMNode().value),
53-
state_default: parseInt(this.refs.state_default.getDOMNode().value),
54-
users_default: parseInt(this.refs.users_default.getDOMNode().value),
48+
ban: parseInt(this.refs.ban.value),
49+
kick: parseInt(this.refs.kick.value),
50+
redact: parseInt(this.refs.redact.value),
51+
invite: parseInt(this.refs.invite.value),
52+
events_default: parseInt(this.refs.events_default.value),
53+
state_default: parseInt(this.refs.state_default.value),
54+
users_default: parseInt(this.refs.users_default.value),
5555
users: power_levels.users,
5656
events: power_levels.events,
5757
};

‎src/skins/vector/views/molecules/RoomTooltip.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,29 @@ limitations under the License.
1717
'use strict';
1818

1919
var React = require('react');
20+
var ReactDOM = require('react-dom');
2021

2122
var dis = require('matrix-react-sdk/lib/dispatcher');
2223

2324
module.exports = React.createClass({
2425
displayName: 'RoomTooltip',
2526

2627
componentDidMount: function() {
28+
var tooltip = ReactDOM.findDOMNode(this);
2729
if (!this.props.bottom) {
2830
// tell the roomlist about us so it can position us
2931
dis.dispatch({
3032
action: 'view_tooltip',
31-
tooltip: this.getDOMNode(),
33+
tooltip: tooltip,
3234
});
3335
}
3436
else {
35-
var tooltip = this.getDOMNode();
3637
tooltip.style.top = tooltip.parentElement.getBoundingClientRect().top + "px";
3738
tooltip.style.display = "block";
3839
}
3940
},
4041

41-
componentDidUnmount: function() {
42+
componentWillUnmount: function() {
4243
if (!this.props.bottom) {
4344
dis.dispatch({
4445
action: 'view_tooltip',

‎src/skins/vector/views/molecules/SearchBar.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ module.exports = React.createClass({
3939

4040
onSearchChange: function(e) {
4141
if (e.keyCode === 13) { // on enter...
42-
this.props.onSearch(this.refs.search_term.getDOMNode().value, this.state.scope);
42+
this.props.onSearch(this.refs.search_term.value, this.state.scope);
4343
}
4444
},
4545

‎src/skins/vector/views/molecules/UserSelector.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ module.exports = React.createClass({
2525
mixins: [UserSelectorController],
2626

2727
onAddUserId: function() {
28-
this.addUser(this.refs.user_id_input.getDOMNode().value);
29-
this.refs.user_id_input.getDOMNode().value = "";
28+
this.addUser(this.refs.user_id_input.value);
29+
this.refs.user_id_input.value = "";
3030
},
3131

3232
render: function() {

‎src/skins/vector/views/molecules/voip/IncomingCallBox.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = React.createClass({
2727
mixins: [IncomingCallBoxController],
2828

2929
getRingAudio: function() {
30-
return this.refs.ringAudio.getDOMNode();
30+
return this.refs.ringAudio;
3131
},
3232

3333
render: function() {

0 commit comments

Comments
 (0)