Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit ebfafb3

Browse files
committed
Revert "Merge pull request #807 from matrix-org/matthew/quick-search"
This reverts commit 0ad1d8c, reversing changes made to 1189368.
1 parent 67c6a8b commit ebfafb3

File tree

7 files changed

+96
-262
lines changed

7 files changed

+96
-262
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"react": "^15.4.0",
7070
"react-addons-css-transition-group": "15.3.2",
7171
"react-dom": "^15.4.0",
72-
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#39d858c",
72+
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
7373
"sanitize-html": "^1.11.1",
7474
"text-encoding-utf-8": "^1.0.1",
7575
"velocity-vector": "vector-im/velocity#059e3b2",

src/ConstantTimeDispatcher.js

Lines changed: 0 additions & 62 deletions
This file was deleted.

src/KeyCode.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ module.exports = {
3232
DELETE: 46,
3333
KEY_D: 68,
3434
KEY_E: 69,
35-
KEY_K: 75,
3635
};

src/components/structures/TimelinePanel.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,6 @@ var TimelinePanel = React.createClass({
590590
this.props.timelineSet.room.setUnreadNotificationCount('highlight', 0);
591591
dis.dispatch({
592592
action: 'on_room_read',
593-
room: this.props.timelineSet.room,
594593
});
595594
}
596595
}

src/components/views/dialogs/QuestionDialog.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ export default React.createClass({
4747
this.props.onFinished(false);
4848
},
4949

50-
componentDidMount: function() {
51-
if (this.props.focus) {
52-
this.refs.button.focus();
53-
}
54-
},
55-
5650
render: function() {
5751
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
5852
const cancelButton = this.props.hasCancelButton ? (
@@ -69,7 +63,7 @@ export default React.createClass({
6963
{this.props.description}
7064
</div>
7165
<div className="mx_Dialog_buttons">
72-
<button ref="button" className="mx_Dialog_primary" onClick={this.onOk}>
66+
<button className="mx_Dialog_primary" onClick={this.onOk} autoFocus={this.props.focus}>
7367
{this.props.button}
7468
</button>
7569
{this.props.extraButtons}

0 commit comments

Comments
 (0)