OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/6473/head
Weblate 2018-03-27 16:32:10 +00:00
parent d34fda26d3 13cc13924e
commit 2d763238d3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/HomePage.js
View File

@ -18,10 +18,10 @@ limitations under the License.
'use strict'; 'use strict';
import React from 'react'; import React from 'react';
import GeminiScrollbar from 'react-gemini-scrollbar';
import request from 'browser-request'; import request from 'browser-request';
import { _t } from 'matrix-react-sdk/lib/languageHandler'; import { _t } from 'matrix-react-sdk/lib/languageHandler';
import sanitizeHtml from 'sanitize-html'; import sanitizeHtml from 'sanitize-html';
import sdk from 'matrix-react-sdk/lib';
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'HomePage', displayName: 'HomePage',
@ -99,11 +99,12 @@ module.exports = React.createClass({
); );
} }
else { else {
const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
return ( return (
<GeminiScrollbar autoshow={true} className="mx_HomePage"> <GeminiScrollbarWrapper autoshow={true} className="mx_HomePage">
<div className="mx_HomePage_body" dangerouslySetInnerHTML={{ __html: this.state.page }}> <div className="mx_HomePage_body" dangerouslySetInnerHTML={{ __html: this.state.page }}>
</div> </div>
</GeminiScrollbar> </GeminiScrollbarWrapper>
); );
} }
} }