Skip to content
This repository was archived by the owner on Feb 20, 2020. It is now read-only.

embed script detects protocol #8

Merged
merged 1 commit into from
Feb 27, 2017
Merged

embed script detects protocol #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions build/embed.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/wellcomeTimeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 01675f1 - 2016-04-30
// b865c5b - 2016-05-01
//-------
// convert calendar to Julian date
// (Julian day number algorithm adopted from Press et al.)
Expand Down
4 changes: 2 additions & 2 deletions build/wellcomeTimeline.min.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/js/embed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
var a = document.createElement('a');
a.href = scriptUri;
var domain = a.hostname;
var protocol = a.protocol;
var port = (a.port == 80 ? '' : ':' + a.port);

$.when($.getScript('//' + domain + port + '/js/libs/easyXDM.min.js'),
Expand Down Expand Up @@ -150,7 +151,7 @@

function createSocket() {

var uri = "http://" + domain + port + "/timeline.html?" +
var uri = protocol + "//" + domain + port + "/timeline.html?" +
"isHomeDomain=" + isHomeDomain +
"&isOnlyInstance=" + isOnlyInstance +
"&dataUri=" + dataUri +
Expand Down