Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clarify in tooltip what flag button does #373

Merged
merged 1 commit into from
May 15, 2017
Merged

Clarify in tooltip what flag button does #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/sidebar/components/test/annotation-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,15 +1120,15 @@ describe('annotation', function() {
it('flags the annotation when the user clicks the "Flag" button', function () {
fakeAnnotationMapper.flagAnnotation.returns(Promise.resolve());
var el = createDirective().element;
var flagBtn = findActionButton(el, 'Flag');
var flagBtn = findActionButton(el, 'Report this annotation to the moderators');
flagBtn.onClick();
assert.called(fakeAnnotationMapper.flagAnnotation);
});

it('highlights the "Flag" button if the annotation is flagged', function () {
var ann = Object.assign(fixtures.defaultAnnotation(), { flagged: true });
var el = createDirective(ann).element;
var flaggedBtn = findActionButton(el, 'Annotation has been flagged');
var flaggedBtn = findActionButton(el, 'Annotation has been reported to the moderators');
assert.ok(flaggedBtn);
});
});
Expand Down
4 changes: 2 additions & 2 deletions src/sidebar/templates/annotation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,14 @@
<annotation-action-button
icon="'h-icon-annotation-flag'"
is-disabled="vm.isDeleted()"
label="'Flag'"
label="'Report this annotation to the moderators'"
ng-if="!vm.isFlagged()"
on-click="vm.flag()"
></annotation-action-button>
<annotation-action-button
icon="'h-icon-annotation-flag annotation--flagged'"
is-disabled="vm.isDeleted()"
label="'Annotation has been flagged'"
label="'Annotation has been reported to the moderators'"
ng-if="vm.isFlagged()"
></annotation-action-button>
</span>
Expand Down