git.iko.soy/jsaddle
on master help sign in
Merge pull request #42 from reflex-frp/aa-prevent-webview-bouncing
50895deHamish Mackenzie
jsaddle-wkwebview/cbits/WKWebView.m+3
compare with master
unifiedsplit
@@ -74,6 +74,9 @@ extern void jsaddleSyncResult(HsStablePtr, JSaddleHandler *, const char * _Nonnu
74void addJSaddleHandler(WKWebView *webView, HsStablePtr startHandler, HsStablePtr resultHandler, HsStablePtr syncHandler) {
74void addJSaddleHandler(WKWebView *webView, HsStablePtr startHandler, HsStablePtr resultHandler, HsStablePtr syncHandler) {
75 JSaddleHandler * handler = [[JSaddleHandler alloc] initHandler:startHandler resultHandler:resultHandler syncHandler:syncHandler];
75 JSaddleHandler * handler = [[JSaddleHandler alloc] initHandler:startHandler resultHandler:resultHandler syncHandler:syncHandler];
76 [[[webView configuration] userContentController] addScriptMessageHandler:handler name:@"jsaddle"];
76 [[[webView configuration] userContentController] addScriptMessageHandler:handler name:@"jsaddle"];
77+#ifdef USE_UIKIT
78+ webView.scrollView.bounces = NO;
79+#endif
77 webView.navigationDelegate = handler;
80 webView.navigationDelegate = handler;
78 webView.UIDelegate = handler;
81 webView.UIDelegate = handler;
79}
82}
jsaddle-wkwebview/jsaddle-wkwebview.cabal+2
@@ -49,8 +49,10 @@ library
49 c-sources:
49 c-sources:
50 cbits-uikit/AppDelegate.m
50 cbits-uikit/AppDelegate.m
51 cbits-uikit/ViewController.m
51 cbits-uikit/ViewController.m
52+ cpp-options: -DUSE_UIKIT
52 else
53 else
53 frameworks: Cocoa
54 frameworks: Cocoa
54 if flag(include-app-delegate)
55 if flag(include-app-delegate)
55 c-sources:
56 c-sources:
56 cbits-cocoa/AppDelegate.m
57 cbits-cocoa/AppDelegate.m
58+ cpp-options: -DUSE_COCOA