Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change the bridge URLs so that they can be used in a CSP #264

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Change the bridge URLs so that they can be used in a CSP #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b37aac
Change the bridge URLs so that they can be used in a CSP
nilswx Jan 19, 2017
861d496
Update README.md to reflect the change to https://wvjb-bridge-loaded
nilswx Jan 19, 2017
d88b047
Merge branch 'master' into master
marcuswestin Nov 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function setupWebViewJavascriptBridge(callback) {
window.WVJBCallbacks = [callback];
var WVJBIframe = document.createElement('iframe');
WVJBIframe.style.display = 'none';
WVJBIframe.src = 'https://__bridge_loaded__';
WVJBIframe.src = 'https://wvjb-bridge_loaded';
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's still an underscore in there. Are you sure this works as expected?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there is a type error. It should be wvjb-bridge-loaded, is that right? @nilswiersema

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a type error. It should be wvjb-bridge-loaded

@nilswiersema

document.documentElement.appendChild(WVJBIframe);
setTimeout(function() { document.documentElement.removeChild(WVJBIframe) }, 0)
}
Expand Down
4 changes: 2 additions & 2 deletions WebViewJavascriptBridge/WebViewJavascriptBridgeBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#define kOldProtocolScheme @"wvjbscheme"
#define kNewProtocolScheme @"https"
#define kQueueHasMessage @"__wvjb_queue_message__"
#define kBridgeLoaded @"__bridge_loaded__"
#define kQueueHasMessage @"wvjb-queue-message"
#define kBridgeLoaded @"wvjb-bridge-loaded"

typedef void (^WVJBResponseCallback)(id responseData);
typedef void (^WVJBHandler)(id data, WVJBResponseCallback responseCallback);
Expand Down
2 changes: 1 addition & 1 deletion WebViewJavascriptBridge/WebViewJavascriptBridge_JS.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
var messageHandlers = {};

var CUSTOM_PROTOCOL_SCHEME = 'https';
var QUEUE_HAS_MESSAGE = '__wvjb_queue_message__';
var QUEUE_HAS_MESSAGE = 'wvjb-queue-message';

var responseCallbacks = {};
var uniqueId = 1;
Expand Down