Skip to content

Commit 107a23d

Browse files
hengheng
authored andcommitted
fix bug
1 parent 2eb8f20 commit 107a23d

File tree

4 files changed

+6
-24
lines changed

4 files changed

+6
-24
lines changed

index.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ var WebView = React.createClass({
1010
propTypes: {
1111
...View.propTypes,
1212
automaticallyAdjustContentInsets: PropTypes.bool,
13-
bounces: PropTypes.bool,
1413
contentInset: PropTypes.object,
1514
html: PropTypes.string,
1615
injectedJavaScript: PropTypes.string,
17-
onNavigationStateChange: PropTypes.func
18-
renderError: PropTypes.func
19-
renderLoading: PropTypes.func
20-
scrollEnabled: PropTypes.bool,
16+
onNavigationStateChange: PropTypes.func,
17+
renderError: PropTypes.func,
18+
renderLoading: PropTypes.func,
2119
startInLoadingState: PropTypes.bool,
2220
url: PropTypes.string,
2321
javaScriptEnabledAndroid: PropTypes.bool,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-webview",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"description": "andorid webview for react-native",
55
"main": "index.js",
66
"scripts": {

src/main/java/com/heng/webview/ReactWebView.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,4 @@ public void setInjectedJavaScript(String injectedJavaScript) {
8080
eventWebClient.setInjectedJavaScript(injectedJavaScript);
8181
}
8282

83-
public void setScrollEnabled(boolean scrollEnabled) {
84-
setVerticalScrollBarEnabled(scrollEnabled);
85-
setHorizontalScrollBarEnabled(scrollEnabled);
86-
}
87-
8883
}

src/main/java/com/heng/webview/WebViewManager.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ public class WebViewManager extends SimpleViewManager<ReactWebView> {
1818
public static final String REACT_CLASS = "RCTWebView";
1919

2020
public static final String AUTOMATICALLY_ADJUST_CONTENT_INSETS = "automaticallyAdjustContentInsets";
21-
public static final String BOUNCES = "bounces";
2221
public static final String CONTENT_INSET = "contentInset";
2322
public static final String HTML = "html";
2423
public static final String INJECTED_JAVA_SCRIPT = "injectedJavaScript";
2524
public static final String ON_NAVIGATION_STATE_CHANGE = "onNavigationStateChange";
2625
public static final String RENDER_ERROR = "renderError";
2726
public static final String RENDER_LOADING = "renderLoading";
28-
public static final String SCROLL_ENABLED = "scrollEnabled";
2927
public static final String START_IN_LOADING_STATE = "startInLoadingState";
3028
public static final String URL = "url";
3129
public static final String JAVA_SCRIPT_ENABLE_ANDROID = "javaScriptEnabledAndroid";
@@ -49,10 +47,6 @@ public void setAutomaticallyAdjustContentInsets(ReactWebView view, boolean autom
4947
view.getSettings().setLoadsImagesAutomatically(automaticallyAdjustContentInsets);
5048
}
5149

52-
@ReactProp(name = BOUNCES)
53-
public void setBounces(ReactWebView view,boolean bounces){
54-
// Unrealized
55-
}
5650

5751
@ReactProp(name = CONTENT_INSET)
5852
public void setContentInset(ReactWebView view,ReadableMap map){
@@ -74,20 +68,15 @@ public void setInjectedJavaScript(ReactWebView view, String injectedJavaScript){
7468
}
7569

7670
@ReactProp(name = RENDER_ERROR)
77-
public void setRenderError(ReactWebView view,Boolean renderError){
71+
public void setRenderError(ReactWebView view,boolean renderError){
7872
// Unrealized
7973
}
8074

8175
@ReactProp(name = RENDER_LOADING)
82-
public void setRenderLoading(ReactWebView view,Boolean renderLoading){
76+
public void setRenderLoading(ReactWebView view,boolean renderLoading){
8377
// Unrealized
8478
}
8579

86-
@ReactProp(name = SCROLL_ENABLED)
87-
public void setScrollEnabled(ReactWebView view, boolean scrollEnabled) {
88-
view.setScrollEnabled(scrollEnabled);
89-
}
90-
9180
@ReactProp(name = START_IN_LOADING_STATE)
9281
public void setStartInLoadingState(ReactWebView view,boolean startInLoadingState){
9382
// Unrealized

0 commit comments

Comments
 (0)