kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Revert and fix

This commit is contained in:
Luke Bennett 2018-04-15 16:35:32 +01:00
parent 3283386a1e
commit 3f66736fa9
No known key found for this signature in database
GPG Key ID: A738E9C68D3BF31A
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/shared/popover.js
View File

@ -2,13 +2,12 @@ import $ from 'jquery';
import _ from 'underscore'; import _ from 'underscore';
export function togglePopover(show) { export function togglePopover(show) {
const $popover = $(this); const isAlreadyShown = this.hasClass('js-popover-show');
const isAlreadyShown = $popover.hasClass('js-popover-show');
if ((show && isAlreadyShown) || (!show && !isAlreadyShown)) { if ((show && isAlreadyShown) || (!show && !isAlreadyShown)) {
return false; return false;
} }
$popover.popover(show ? 'show' : 'hide'); this.popover(show ? 'show' : 'hide');
$popover.toggleClass('disable-animation js-popover-show', show); this.toggleClass('disable-animation js-popover-show', show);
return true; return true;
} }

8
spec/javascripts/feature_highlight/feature_highlight_spec.js
View File

@ -29,7 +29,6 @@ describe('feature highlight', () => {
mock = new MockAdapter(axios); mock = new MockAdapter(axios);
mock.onGet('/test').reply(200); mock.onGet('/test').reply(200);
spyOn(window, 'addEventListener'); spyOn(window, 'addEventListener');
spyOn(window, 'removeEventListener');
featureHighlight.setupFeatureHighlightPopover('test', 0); featureHighlight.setupFeatureHighlightPopover('test', 0);
}); });
@ -64,12 +63,7 @@ describe('feature highlight', () => {
it('setup show.bs.popover', () => { it('setup show.bs.popover', () => {
$(selector).trigger('show.bs.popover'); $(selector).trigger('show.bs.popover');
expect(window.addEventListener).toHaveBeenCalledWith('scroll', jasmine.any(Function)); expect(window.addEventListener).toHaveBeenCalledWith('scroll', jasmine.any(Function), { once: true });
});
it('setup hide.bs.popover', () => {
$(selector).trigger('hide.bs.popover');
expect(window.removeEventListener).toHaveBeenCalledWith('scroll', jasmine.any(Function));
}); });
it('removes disabled attribute', () => { it('removes disabled attribute', () => {