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
520e09d4
Commit
520e09d4
authored
Dec 03, 2015
by
Sean Hammond
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor isHighlight()
Clarify the logic a little.
parent
d4f97f8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
annotation.js
h/static/scripts/directive/annotation.js
+5
-4
annotation-test.js
h/static/scripts/directive/test/annotation-test.js
+2
-2
No files found.
h/static/scripts/directive/annotation.js
View file @
520e09d4
...
...
@@ -216,10 +216,11 @@ function AnnotationController(
// example there's no model.highlight: true. Instead a highlight is
// defined as an annotation that isn't a page note or a reply and that
// has no text or tags.
var
targetLength
=
(
model
.
target
||
[]).
length
;
var
referencesLength
=
(
model
.
references
||
[]).
length
;
var
tagsLength
=
(
model
.
tags
||
[]).
length
;
return
(
targetLength
&&
!
referencesLength
&&
!
(
model
.
text
||
tagsLength
));
var
isPageNote
=
(
model
.
target
||
[]).
length
===
0
;
var
isReply
=
(
model
.
references
||
[]).
length
!==
0
;
var
hasText
=
(
model
.
text
||
''
).
length
!==
0
;
var
hasTags
=
(
model
.
tags
||
[]).
length
!==
0
;
return
(
!
isPageNote
&&
!
isReply
&&
!
hasText
&&
!
hasTags
);
}
};
...
...
h/static/scripts/directive/test/annotation-test.js
View file @
520e09d4
...
...
@@ -683,7 +683,7 @@ describe('annotation.js', function() {
assert
.
isFalse
(
vm
.
isHighlight
());
});
it
(
'returns
0
for page notes'
,
function
()
{
it
(
'returns
false
for page notes'
,
function
()
{
annotation
.
$highlight
=
undefined
;
// Page notes have no targets.
annotation
.
target
=
[];
...
...
@@ -696,7 +696,7 @@ describe('annotation.js', function() {
var
vm
=
createDirective
().
controller
;
assert
.
equal
(
vm
.
isHighlight
(),
0
);
assert
.
isFalse
(
vm
.
isHighlight
()
);
});
it
(
'returns false for replies'
,
function
()
{
...
...
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