Skip to content

Commit dcecc11

Browse files
committed
Remove WebViewJavascriptBridge -reset method. It is unreliable and should not be used. See GH issue marcuswestin#99
1 parent 646def3 commit dcecc11

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

Changelog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ Release Checklist
1313
Version History
1414
---------------
1515

16+
Intended v5.0.0
17+
+ Removed `WebViewJavascriptBridge -reset`. It should never have been exposed as a public API.
18+
1619
v4.1.4
1720
+ Improve how WVJB handles the case when there is no ObjC handler for a message received from js.
1821
+ If an objc handler throws and exception, let it bubble up to the webkit engine instead of catching it in WVJB.

WebViewJavascriptBridge/WebViewJavascriptBridge.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,5 @@ typedef void (^WVJBHandler)(id data, WVJBResponseCallback responseCallback);
3939
- (void)callHandler:(NSString*)handlerName;
4040
- (void)callHandler:(NSString*)handlerName data:(id)data;
4141
- (void)callHandler:(NSString*)handlerName data:(id)data responseCallback:(WVJBResponseCallback)responseCallback;
42-
- (void)reset;
4342

4443
@end

WebViewJavascriptBridge/WebViewJavascriptBridge.m

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ + (instancetype)bridgeForWebView:(WVJB_WEBVIEW_TYPE*)webView webViewDelegate:(WV
5151
{
5252
WebViewJavascriptBridge* bridge = [[WebViewJavascriptBridge alloc] init];
5353
[bridge _platformSpecificSetup:webView webViewDelegate:webViewDelegate handler:messageHandler resourceBundle:bundle];
54-
[bridge reset];
5554
return bridge;
5655
}
5756

@@ -79,15 +78,18 @@ - (void)registerHandler:(NSString *)handlerName handler:(WVJBHandler)handler {
7978
_messageHandlers[handlerName] = [handler copy];
8079
}
8180

82-
- (void)reset {
83-
_startupMessageQueue = [NSMutableArray array];
84-
_responseCallbacks = [NSMutableDictionary dictionary];
85-
_uniqueId = 0;
86-
}
87-
8881
/* Platform agnostic internals
8982
*****************************/
9083

84+
- (id)init {
85+
if (self = [super init]) {
86+
_startupMessageQueue = [NSMutableArray array];
87+
_responseCallbacks = [NSMutableDictionary dictionary];
88+
_uniqueId = 0;
89+
}
90+
return self;
91+
}
92+
9193
- (void)dealloc {
9294
[self _platformSpecificDealloc];
9395

0 commit comments

Comments
 (0)