Commit 520e09d4 authored by Sean Hammond's avatar Sean Hammond

Refactor isHighlight()

Clarify the logic a little.
parent d4f97f8f
...@@ -216,10 +216,11 @@ function AnnotationController( ...@@ -216,10 +216,11 @@ function AnnotationController(
// example there's no model.highlight: true. Instead a highlight is // 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 // defined as an annotation that isn't a page note or a reply and that
// has no text or tags. // has no text or tags.
var targetLength = (model.target || []).length; var isPageNote = (model.target || []).length === 0;
var referencesLength = (model.references || []).length; var isReply = (model.references || []).length !== 0;
var tagsLength = (model.tags || []).length; var hasText = (model.text || '').length !== 0;
return (targetLength && !referencesLength && !(model.text || tagsLength)); var hasTags = (model.tags || []).length !== 0;
return (!isPageNote && !isReply && !hasText && !hasTags);
} }
}; };
......
...@@ -683,7 +683,7 @@ describe('annotation.js', function() { ...@@ -683,7 +683,7 @@ describe('annotation.js', function() {
assert.isFalse(vm.isHighlight()); assert.isFalse(vm.isHighlight());
}); });
it('returns 0 for page notes', function() { it('returns false for page notes', function() {
annotation.$highlight = undefined; annotation.$highlight = undefined;
// Page notes have no targets. // Page notes have no targets.
annotation.target = []; annotation.target = [];
...@@ -696,7 +696,7 @@ describe('annotation.js', function() { ...@@ -696,7 +696,7 @@ describe('annotation.js', function() {
var vm = createDirective().controller; var vm = createDirective().controller;
assert.equal(vm.isHighlight(), 0); assert.isFalse(vm.isHighlight());
}); });
it('returns false for replies', function() { it('returns false for replies', function() {
......
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