Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
coopwire-hypothesis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
孙灵跃 Leon Sun
coopwire-hypothesis
Commits
9854127d
Commit
9854127d
authored
Oct 23, 2013
by
Randall Leeds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pdf.js on FF
parent
0fd2fcff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
8 deletions
+15
-8
guest.coffee
h/js/guest.coffee
+5
-4
bridge.coffee
h/js/plugin/bridge.coffee
+5
-4
services.coffee
h/js/services.coffee
+5
-0
No files found.
h/js/guest.coffee
View file @
9854127d
...
...
@@ -48,10 +48,6 @@ class Annotator.Guest extends Annotator
formatted
.
document
.
title
=
formatted
.
document
.
title
.
slice
()
formatted
onConnect
:
(
source
,
origin
,
scope
)
=>
# Unfortunately, jschannel chokes on chrome-extension: origins
if
origin
.
match
/^chrome-extension:\/\//
origin
=
'*'
@
panel
=
this
.
_setupXDM
window
:
source
origin
:
origin
...
...
@@ -76,6 +72,11 @@ class Annotator.Guest extends Annotator
@
plugins
.
Heatmap
.
_update
()
_setupXDM
:
(
options
)
->
# jschannel chokes FF and Chrome extension origins.
if
(
options
.
origin
.
match
/^chrome-extension:\/\//
)
or
(
options
.
origin
.
match
/^resource:\/\//
)
options
.
origin
=
'*'
channel
=
Channel
.
build
options
channel
...
...
h/js/plugin/bridge.coffee
View file @
9854127d
...
...
@@ -102,6 +102,11 @@ class Annotator.Plugin.Bridge extends Annotator.Plugin
# Construct a channel to another frame
_build
:
(
options
)
->
# jschannel chokes on FF and Chrome extension origins.
if
(
options
.
origin
.
match
/^chrome-extension:\/\//
)
or
(
options
.
origin
.
match
/^resource:\/\//
)
options
.
origin
=
'*'
console
.
log
"Bridge plugin connecting to
#{
options
.
origin
}
"
channel
=
Channel
.
build
(
options
)
...
...
@@ -236,10 +241,6 @@ class Annotator.Plugin.Bridge extends Annotator.Plugin
method
:
'loadAnnotations'
params
:
(
this
.
_format
a
for
t
,
a
of
@
cache
)
# Unfortunately, jschannel chokes on chrome-extension: origins
if
options
.
origin
.
match
/^chrome-extension:\/\//
options
.
origin
=
'*'
channel
=
this
.
_build
options
@
links
.
push
...
...
h/js/services.coffee
View file @
9854127d
...
...
@@ -186,6 +186,11 @@ class Hypothesis extends Annotator
_setupXDM
:
(
options
)
->
$rootScope
=
@
element
.
injector
().
get
'$rootScope'
# jschannel chokes FF and Chrome extension origins.
if
(
options
.
origin
.
match
/^chrome-extension:\/\//
)
or
(
options
.
origin
.
match
/^resource:\/\//
)
options
.
origin
=
'*'
provider
=
Channel
.
build
options
# Dodge toolbars [DISABLE]
#@provider.getMaxBottom (max) =>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment