Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1883 from vector-im/rav/remove_relayoutonupdate

Browse Source 
Remove relayoutOnUpdate prop on gemini-scrollbar
This commit is contained in:
David Baker 2016-07-27 15:55:27 +01:00 committed by GitHub
commit e34db7b8c6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -39,7 +39,7 @@
"extract-text-webpack-plugin": "^0.9.1", "extract-text-webpack-plugin": "^0.9.1",
"filesize": "^3.1.2", "filesize": "^3.1.2",
"flux": "~2.0.3", "flux": "~2.0.3",
"gemini-scrollbar": "matrix-org/gemini-scrollbar#468544d", "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.1", "gfm.css": "^1.1.1",
"highlight.js": "^9.0.0", "highlight.js": "^9.0.0",
"linkifyjs": "^2.0.0-beta.4", "linkifyjs": "^2.0.0-beta.4",
@ -51,7 +51,7 @@
"react-dnd": "^2.1.4", "react-dnd": "^2.1.4",
"react-dnd-html5-backend": "^2.1.2", "react-dnd-html5-backend": "^2.1.2",
"react-dom": "^15.2.1", "react-dom": "^15.2.1",
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#dbf0abf", "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
"sanitize-html": "^1.11.1" "sanitize-html": "^1.11.1"
}, },
"devDependencies": { "devDependencies": {

3
src/components/structures/RoomDirectory.js
View File

@ -282,8 +282,7 @@ module.exports = React.createClass({
<SimpleRoomHeader title="Directory" /> <SimpleRoomHeader title="Directory" />
<div className="mx_RoomDirectory_list"> <div className="mx_RoomDirectory_list">
<input ref="roomAlias" placeholder="Join a room (e.g. #foo:domain.com)" className="mx_RoomDirectory_input" size="64" onKeyUp={ this.onKeyUp }/> <input ref="roomAlias" placeholder="Join a room (e.g. #foo:domain.com)" className="mx_RoomDirectory_input" size="64" onKeyUp={ this.onKeyUp }/>
<GeminiScrollbar className="mx_RoomDirectory_tableWrapper" <GeminiScrollbar className="mx_RoomDirectory_tableWrapper">
relayoutOnUpdate={false} >
<table ref="directory_table" className="mx_RoomDirectory_table"> <table ref="directory_table" className="mx_RoomDirectory_table">
<tbody> <tbody>
{ this.getRows(this.state.roomAlias) } { this.getRows(this.state.roomAlias) }