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

Move from centralised singleton to imported singletons #228

Merged
merged 3 commits into from
Mar 28, 2022
Merged

Move from centralised singleton to imported singletons #228

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0533bfe
ADAPT-9790 - move to imported singletons
Mar 16, 2022
958b312
ADAPT-9790 - removed extra line
Mar 16, 2022
02eb9a7
ADAPT-9790 - addressed review comment; import
Mar 16, 2022
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 bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adapt-contrib-media",
"version": "5.4.1",
"version": "5.4.2",
"framework": ">=5.17.2",
"homepage": "https://github.com/adaptlearning/adapt-contrib-media",
"bugs": "https://github.com/adaptlearning/adapt-contrib-media/issues",
Expand Down
19 changes: 11 additions & 8 deletions js/mediaView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import Adapt from 'core/js/adapt';
import a11y from 'core/js/a11y';
import ComponentView from 'core/js/views/componentView';
import 'libraries/mediaelement-and-player';
import 'libraries/mediaelement-fullscreen-hook';
import log from 'core/js/a11y/log';
eleanor-heath marked this conversation as resolved.
Show resolved Hide resolved
import offlineStorage from 'core/js/offlineStorage';

/*
* Default shortcut keys trap a screen reader user inside the player once in focus. These keys are unnecessary
Expand Down Expand Up @@ -136,10 +139,10 @@ class MediaView extends ComponentView {

if (this.model.get('_useClosedCaptions')) {
const startLanguage = this.model.get('_startLanguage') || 'en';
if (!Adapt.offlineStorage.get('captions')) {
Adapt.offlineStorage.set('captions', startLanguage);
if (!offlineStorage.get('captions')) {
offlineStorage.set('captions', startLanguage);
}
modelOptions.startLanguage = this.checkForSupportedCCLanguage(Adapt.offlineStorage.get('captions'));
modelOptions.startLanguage = this.checkForSupportedCCLanguage(offlineStorage.get('captions'));
}

if (modelOptions.alwaysShowControls === undefined) {
Expand All @@ -159,7 +162,7 @@ class MediaView extends ComponentView {
const _media = this.model.get('_media');
// if no media is selected - set ready now, as success won't be called
if (!_media.mp3 && !_media.mp4 && !_media.ogv && !_media.webm && !_media.source) {
Adapt.log.warn('ERROR! No media is selected in components.json for component ' + this.model.get('_id'));
log.warn('ERROR! No media is selected in components.json for component ' + this.model.get('_id'));
this.setReadyStatus();
return;
}
Expand Down Expand Up @@ -198,7 +201,7 @@ class MediaView extends ComponentView {
})
.fail(() => {
MediaView.froogaloopAdded = false;
Adapt.log.error('Could not load froogaloop.js');
log.error('Could not load froogaloop.js');
});
break;
default:
Expand Down Expand Up @@ -254,7 +257,7 @@ class MediaView extends ComponentView {

this.$(selector).on('click.mediaCaptionsChange', _.debounce(() => {
const srclang = this.mediaElement.player.selectedTrack ? this.mediaElement.player.selectedTrack.srclang : 'none';
Adapt.offlineStorage.set('captions', srclang);
offlineStorage.set('captions', srclang);
Adapt.trigger('media:captionsChange', this, srclang);
}, 250)); // needs debouncing because the click event fires twice

Expand Down Expand Up @@ -358,7 +361,7 @@ class MediaView extends ComponentView {
const player = this.mediaElement.player;

if (!player) {
Adapt.log.warn('MediaView.setupPlayPauseToggle: OOPS! there is no player reference.');
log.warn('MediaView.setupPlayPauseToggle: OOPS! there is no player reference.');
return;
}

Expand Down Expand Up @@ -497,7 +500,7 @@ class MediaView extends ComponentView {
// need slight delay before focussing button to make it work when JAWS is running
// see https://github.com/adaptlearning/adapt_framework/issues/2427
_.delay(() => {
Adapt.a11y.focus(this.$('.media__transcript-btn'));
a11y.focus(this.$('.media__transcript-btn'));
}, 250);
}

Expand Down