Commit c992f248 authored by Randall Leeds's avatar Randall Leeds

Merge remote-tracking branch 'origin/fix-for-ff-origin-error' into develop

Closes #310
parents 2976ced5 df565197
......@@ -29,6 +29,8 @@ class Annotator.Host extends Annotator
hostOrigin = '*'
else
hostOrigin = window.location.origin
# XXX: Hack for missing window.location.origin in FF
hostOrigin ?= window.location.protocol + "//" + window.location.host
@frame = $('<iframe></iframe>')
.css(visibility: 'hidden')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment