self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

iOS: various fixes

Browse Source
This commit is contained in:
Laurent Cozic
2017-11-19 15:19:36 +00:00
parent ca20a2a1c2
commit 4b5c1491d0
6 changed files with 79 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ReactNativeClient/lib/components/note-body-viewer.js
View File

@ -1,5 +1,5 @@
const React = require('react'); const Component = React.Component;
const { WebView, View, Linking } = require('react-native');
const { Platform, WebView, View, Linking } = require('react-native');
const { globalStyle } = require('lib/components/global-style.js');
const { Resource } = require('lib/models/resource.js');
const { reg } = require('lib/registry.js');
@ -52,11 +52,17 @@ class NoteBodyViewer extends Component {
const html = this.mdToHtml_.render(note ? note.body : '', this.props.webViewStyle, mdOptions);
let webViewStyle = {}
webViewStyle.opacity = this.state.webViewLoaded ? 1 : 0.01;
// On iOS, the onLoadEnd() event is never fired so always
// display the webview (don't do the little trick
// to avoid the white flash).
if (Platform.OS !== 'ios') {
webViewStyle.opacity = this.state.webViewLoaded ? 1 : 0.01;
}
return (
<View style={style}>
<WebView
scalesPageToFit={false}
style={webViewStyle}
source={{ html: html }}
onLoadEnd={() => this.onLoadEnd()}