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

Jump to bottom

Update: Add aria-pressed setting for CC button #264

Merged
merged 2 commits into from
Aug 1, 2017
Merged

Update: Add aria-pressed setting for CC button #264

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60df591
Update: Add aria-pressed setting for CC button
Jul 31, 2017
d480022
Merge branch 'master' into cc_aria_pressed
Minh-Ng Aug 1, 2017
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
2 changes: 1 addition & 1 deletion src/lib/viewers/media/MediaControls.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<label class="bp-media-controls-label bp-media-controls-timecode">00:00</label>
<span class="bp-media-controls-label">&nbsp;&#47;&nbsp;</span>
<label class="bp-media-controls-label bp-media-controls-duration">00:00</label>
<button class="bp-media-controls-btn bp-media-cc-icon">
<button class="bp-media-controls-btn bp-media-cc-icon" aria-pressed="false">
<div class="bp-media-controls-cc-icon-text">CC</div>
</button>
<button class="bp-media-controls-btn bp-media-gear-icon" aria-haspopup="true">
Expand Down
6 changes: 6 additions & 0 deletions src/lib/viewers/media/Settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ class Settings extends EventEmitter {
/** @property {HTMLElement} - Settings button element (gear icon) */
settingsButtonEl;

/** @property {HTMLElement} - CC button element */
ccButtonEl;

/** @property {boolean} - Whether settings menu is visible */
visible = false;

Expand Down Expand Up @@ -140,6 +143,7 @@ class Settings extends EventEmitter {
this.firstMenuItem = this.settingsEl.querySelectorAll('.bp-media-settings-item')[0];

this.settingsButtonEl = this.containerEl.querySelector('.bp-media-gear-icon');
this.ccButtonEl = this.containerEl.querySelector('.bp-media-cc-icon');

addActivationListener(this.settingsEl, this.menuEventHandler);
this.containerEl.classList.add(CLASS_SETTINGS_SUBTITLES_UNAVAILABLE);
Expand Down Expand Up @@ -450,8 +454,10 @@ class Settings extends EventEmitter {
}

this.containerEl.classList.remove(CLASS_SETTINGS_SUBTITLES_ON);
this.ccButtonEl.setAttribute('aria-pressed', 'false');
} else {
this.containerEl.classList.add(CLASS_SETTINGS_SUBTITLES_ON);
this.ccButtonEl.setAttribute('aria-pressed', 'true');
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/viewers/media/__tests__/Settings-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="container"><div class="bp-media-gear-icon" tabindex="0"></div></div>
<div class="container"><div class="bp-media-gear-icon" tabindex="0"/><button class="bp-media-cc-icon" tabindex="0"/></div>
3 changes: 3 additions & 0 deletions src/lib/viewers/media/__tests__/Settings-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@ describe('lib/viewers/media/Settings', () => {

expect(settings.toggleToSubtitle).to.equal('3');
expect(settings.areSubtitlesOn()).to.equal(false);
expect(settings.ccButtonEl.getAttribute('aria-pressed')).to.equal('false');
expect(settings.containerEl).to.not.have.class('bp-media-settings-subtitles-on');
});

Expand All @@ -642,12 +643,14 @@ describe('lib/viewers/media/Settings', () => {

expect(settings.toggleToSubtitle).to.equal('2');
expect(settings.areSubtitlesOn()).to.equal(false);
expect(settings.ccButtonEl.getAttribute('aria-pressed')).to.equal('false');
expect(settings.containerEl).to.not.have.class('bp-media-settings-subtitles-on');
});

it('should set subtitles-on on container when subtitles are selected', () => {
settings.handleSubtitleSelection('-1', '2');

expect(settings.ccButtonEl.getAttribute('aria-pressed')).to.equal('true');
expect(settings.containerEl).to.have.class('bp-media-settings-subtitles-on');
});
});
Expand Down