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
ba20e050
Commit
ba20e050
authored
May 25, 2017
by
Robert Hodan
Committed by
Juan Corona
Jun 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the crossframe to show/hide the sidebar
parent
d451b587
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
27 deletions
+30
-27
guest.coffee
src/annotator/guest.coffee
+19
-0
sidebar.coffee
src/annotator/sidebar.coffee
+2
-27
frame-sync.js
src/sidebar/frame-sync.js
+9
-0
No files found.
src/annotator/guest.coffee
View file @
ba20e050
...
@@ -39,6 +39,8 @@ module.exports = class Guest extends Delegator
...
@@ -39,6 +39,8 @@ module.exports = class Guest extends Delegator
".annotator-hl click"
:
"onHighlightClick"
".annotator-hl click"
:
"onHighlightClick"
".annotator-hl mouseover"
:
"onHighlightMouseover"
".annotator-hl mouseover"
:
"onHighlightMouseover"
".annotator-hl mouseout"
:
"onHighlightMouseout"
".annotator-hl mouseout"
:
"onHighlightMouseout"
"click"
:
"onElementClick"
"touchstart"
:
"onElementTouchStart"
options
:
options
:
Document
:
{}
Document
:
{}
...
@@ -336,6 +338,7 @@ module.exports = class Guest extends Delegator
...
@@ -336,6 +338,7 @@ module.exports = class Guest extends Delegator
targets
.
then
(
->
self
.
publish
(
'beforeAnnotationCreated'
,
[
annotation
]))
targets
.
then
(
->
self
.
publish
(
'beforeAnnotationCreated'
,
[
annotation
]))
targets
.
then
(
->
self
.
anchor
(
annotation
))
targets
.
then
(
->
self
.
anchor
(
annotation
))
@
crossframe
?
.
call
(
'showSidebar'
)
unless
annotation
.
$highlight
annotation
annotation
createHighlight
:
->
createHighlight
:
->
...
@@ -374,6 +377,7 @@ module.exports = class Guest extends Delegator
...
@@ -374,6 +377,7 @@ module.exports = class Guest extends Delegator
showAnnotations
:
(
annotations
)
->
showAnnotations
:
(
annotations
)
->
tags
=
(
a
.
$tag
for
a
in
annotations
)
tags
=
(
a
.
$tag
for
a
in
annotations
)
@
crossframe
?
.
call
(
'showAnnotations'
,
tags
)
@
crossframe
?
.
call
(
'showAnnotations'
,
tags
)
@
crossframe
?
.
call
(
'showSidebar'
)
toggleAnnotationSelection
:
(
annotations
)
->
toggleAnnotationSelection
:
(
annotations
)
->
tags
=
(
a
.
$tag
for
a
in
annotations
)
tags
=
(
a
.
$tag
for
a
in
annotations
)
...
@@ -421,6 +425,21 @@ module.exports = class Guest extends Delegator
...
@@ -421,6 +425,21 @@ module.exports = class Guest extends Delegator
else
else
this
.
showAnnotations
annotations
this
.
showAnnotations
annotations
# Moved from Sidebar.coffee to Guest
onElementClick
:
(
event
)
->
if
!
@
selectedTargets
?
.
length
@
crossframe
?
.
call
(
'hideSidebar'
)
# Moved from Sidebar.coffee to Guest
onElementTouchStart
:
(
event
)
->
# Mobile browsers do not register click events on
# elements without cursor: pointer. So instead of
# adding that to every element, we can add the initial
# touchstart event which is always registered to
# make up for the lack of click support for all elements.
if
!
@
selectedTargets
?
.
length
@
crossframe
?
.
call
(
'hideSidebar'
)
onHighlightMouseover
:
(
event
)
->
onHighlightMouseover
:
(
event
)
->
return
unless
@
visibleHighlights
return
unless
@
visibleHighlights
annotation
=
$
(
event
.
currentTarget
).
data
(
'annotation'
)
annotation
=
$
(
event
.
currentTarget
).
data
(
'annotation'
)
...
...
src/annotator/sidebar.coffee
View file @
ba20e050
...
@@ -47,29 +47,12 @@ module.exports = class Sidebar extends Host
...
@@ -47,29 +47,12 @@ module.exports = class Sidebar extends Host
@
onHelpRequest
=
serviceConfig
.
onHelpRequest
@
onHelpRequest
=
serviceConfig
.
onHelpRequest
this
.
_setupSidebarEvents
()
this
.
_setupSidebarEvents
()
this
.
_setupDocumentEvents
()
_setupDocumentEvents
:
->
sidebarTrigger
(
document
.
body
,
=>
this
.
show
())
@
element
.
on
'click'
,
(
event
)
=>
if
!
@
selectedTargets
?
.
length
this
.
hide
()
# Mobile browsers do not register click events on
# elements without cursor: pointer. So instead of
# adding that to every element, we can add the initial
# touchstart event which is always registered to
# make up for the lack of click support for all elements.
@
element
.
on
'touchstart'
,
(
event
)
=>
if
!
@
selectedTargets
?
.
length
this
.
hide
()
return
this
_setupSidebarEvents
:
->
_setupSidebarEvents
:
->
annotationCounts
(
document
.
body
,
@
crossframe
)
annotationCounts
(
document
.
body
,
@
crossframe
)
@
crossframe
.
on
(
'showSidebar'
,
=>
this
.
show
())
@
crossframe
.
on
(
'hideSidebar'
,
=>
this
.
hide
())
@
crossframe
.
on
(
events
.
LOGIN_REQUESTED
,
=>
@
crossframe
.
on
(
events
.
LOGIN_REQUESTED
,
=>
if
@
onLoginRequest
if
@
onLoginRequest
@
onLoginRequest
()
@
onLoginRequest
()
...
@@ -205,11 +188,3 @@ module.exports = class Sidebar extends Host
...
@@ -205,11 +188,3 @@ module.exports = class Sidebar extends Host
isOpen
:
->
isOpen
:
->
!
@
frame
.
hasClass
(
'annotator-collapsed'
)
!
@
frame
.
hasClass
(
'annotator-collapsed'
)
createAnnotation
:
(
annotation
=
{})
->
super
this
.
show
()
unless
annotation
.
$highlight
showAnnotations
:
(
annotations
)
->
super
this
.
show
()
src/sidebar/frame-sync.js
View file @
ba20e050
...
@@ -149,6 +149,15 @@ function FrameSync($rootScope, $window, Discovery, annotationUI, bridge) {
...
@@ -149,6 +149,15 @@ function FrameSync($rootScope, $window, Discovery, annotationUI, bridge) {
bridge
.
on
(
'sidebarOpened'
,
function
()
{
bridge
.
on
(
'sidebarOpened'
,
function
()
{
$rootScope
.
$broadcast
(
'sidebarOpened'
);
$rootScope
.
$broadcast
(
'sidebarOpened'
);
});
});
// These merely relay calls
bridge
.
on
(
'showSidebar'
,
function
()
{
bridge
.
call
(
'showSidebar'
);
});
bridge
.
on
(
'hideSidebar'
,
function
()
{
bridge
.
call
(
'hideSidebar'
);
});
}
}
/**
/**
...
...
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