contrib modules updates
This commit is contained in:
@@ -127,7 +127,7 @@
|
||||
},
|
||||
swfPath: '/libraries/jplayer/dist/jplayer',
|
||||
wmode: 'window',
|
||||
preload: settings.lazyload,
|
||||
preload: file.lazyload,
|
||||
keyEnabled: true,
|
||||
supplied: file.filetype,
|
||||
},
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
swfPath: '/libraries/jplayer/dist/jplayer',
|
||||
wmode: 'window',
|
||||
keyEnabled: true,
|
||||
preload: settings.lazyload,
|
||||
preload: file.lazyload,
|
||||
supplied: file.filetype
|
||||
});
|
||||
});
|
||||
|
||||
@@ -23,6 +23,18 @@
|
||||
// Create waveform.
|
||||
const wavesurfer = WaveSurfer.create({
|
||||
container: `#${$(wavecontainer).attr('id')} .waveform`,
|
||||
audioRate: settings.audioRate,
|
||||
autoCenter: settings.autoCenter,
|
||||
barGap: settings.barGap,
|
||||
barHeight: settings.barHeight,
|
||||
barWidth: settings.barWidth,
|
||||
cursorColor: settings.cursorColor,
|
||||
cursorWidth: settings.cursorWidth,
|
||||
forceDecode: settings.forceDecode,
|
||||
normalize: settings.normalize,
|
||||
progressColor: settings.progressColor,
|
||||
responsive: settings.responsive,
|
||||
waveColor: settings.waveColor,
|
||||
});
|
||||
|
||||
// Load the file.
|
||||
@@ -32,12 +44,12 @@
|
||||
wavesurfer.setVolume(settings.volume);
|
||||
|
||||
// Handle play/pause.
|
||||
$(wavecontainer).find('.player-button.playpause').on('click', () => {
|
||||
$(wavecontainer).find('.player-button.playpause').on('click', (event) => {
|
||||
Drupal.AudiofieldWavesurfer.PlayPause(wavecontainer, wavesurfer);
|
||||
});
|
||||
|
||||
// Handle volume change.
|
||||
$(wavecontainer).find('.volume').on('change', () => {
|
||||
$(wavecontainer).find('.volume').on('change', (event) => {
|
||||
wavesurfer.setVolume(($(event.currentTarget).val() / 10));
|
||||
});
|
||||
|
||||
@@ -61,6 +73,18 @@
|
||||
// Create waveform.
|
||||
const wavesurfer = WaveSurfer.create({
|
||||
container: `#${$(wavecontainer).attr('id')} .waveform`,
|
||||
audioRate: settings.audioRate,
|
||||
autoCenter: settings.autoCenter,
|
||||
barGap: settings.barGap,
|
||||
barHeight: settings.barHeight,
|
||||
barWidth: settings.barWidth,
|
||||
cursorColor: settings.cursorColor,
|
||||
cursorWidth: settings.cursorWidth,
|
||||
forceDecode: settings.forceDecode,
|
||||
normalize: settings.normalize,
|
||||
progressColor: settings.progressColor,
|
||||
responsive: settings.responsive,
|
||||
waveColor: settings.waveColor,
|
||||
});
|
||||
|
||||
// Set the default volume.
|
||||
@@ -77,28 +101,33 @@
|
||||
wavesurfer.load(first.attr('data-src'));
|
||||
|
||||
// Handle play/pause.
|
||||
$(wavecontainer).find('.player-button.playpause').on('click', () => {
|
||||
$(wavecontainer).find('.player-button.playpause').on('click', (event) => {
|
||||
Drupal.AudiofieldWavesurfer.PlayPause(wavecontainer, wavesurfer);
|
||||
});
|
||||
|
||||
// Handle next/previous.
|
||||
$(wavecontainer).find('.player-button.next').on('click', () => {
|
||||
$(wavecontainer).find('.player-button.next').on('click', (event) => {
|
||||
Drupal.AudiofieldWavesurfer.Next(wavecontainer, wavesurfer);
|
||||
});
|
||||
$(wavecontainer).find('.player-button.previous').on('click', () => {
|
||||
$(wavecontainer).find('.player-button.previous').on('click', (event) => {
|
||||
Drupal.AudiofieldWavesurfer.Previous(wavecontainer, wavesurfer);
|
||||
});
|
||||
|
||||
// Handle clicking track.
|
||||
$(wavecontainer).find('.playlist .track').on('click', () => {
|
||||
// Load the track.
|
||||
Drupal.AudiofieldWavesurfer.Load(wavecontainer, wavesurfer, $(event.currentTarget));
|
||||
// Play the track.
|
||||
Drupal.AudiofieldWavesurfer.PlayPause(wavecontainer, wavesurfer);
|
||||
$(wavecontainer).find('.playlist .track').on('click', (event) => {
|
||||
// Check if the track is already playing.
|
||||
if ($(this).hasClass('playing')) {
|
||||
// Play/pause the track if it is already loaded.
|
||||
Drupal.AudiofieldWavesurfer.PlayPause(wavecontainer, wavesurfer);
|
||||
}
|
||||
else {
|
||||
// Load the track.
|
||||
Drupal.AudiofieldWavesurfer.Load(wavecontainer, wavesurfer, $(event.currentTarget));
|
||||
}
|
||||
});
|
||||
|
||||
// Handle volume change.
|
||||
$(wavecontainer).find('.volume').on('change', () => {
|
||||
$(wavecontainer).find('.volume').on('change', (event) => {
|
||||
wavesurfer.setVolume(($(event.currentTarget).val() / 10));
|
||||
});
|
||||
|
||||
@@ -108,7 +137,7 @@
|
||||
}
|
||||
|
||||
// Handle track finishing.
|
||||
wavesurfer.on('finish', () => {
|
||||
wavesurfer.on('finish', (event) => {
|
||||
Drupal.AudiofieldWavesurfer.Next(wavecontainer, wavesurfer);
|
||||
});
|
||||
});
|
||||
@@ -147,13 +176,13 @@
|
||||
*/
|
||||
Drupal.AudiofieldWavesurfer.Load = (wavecontainer, wavesurfer, track) => {
|
||||
// Load the track.
|
||||
wavesurfer.on('ready', () => {
|
||||
wavesurfer.play();
|
||||
wavesurfer.load(track.attr('data-src'));
|
||||
wavesurfer.on('ready', (event) => {
|
||||
$(wavecontainer).removeClass('playing');
|
||||
$(wavecontainer).addClass('playing');
|
||||
$(wavecontainer).find('.player-button.playpause').html('Pause');
|
||||
wavesurfer.play();
|
||||
});
|
||||
wavesurfer.load(track.attr('data-src'));
|
||||
// Remove playing from all other tracks.
|
||||
$(wavecontainer).find('.track').removeClass('playing');
|
||||
// Set the class on this track.
|
||||
|
||||
@@ -13,18 +13,30 @@
|
||||
Drupal.AudiofieldWavesurfer.generate = function (context, file, settings) {
|
||||
$.each($(context).find('#' + file.id).once('generate-waveform'), function (index, wavecontainer) {
|
||||
var wavesurfer = WaveSurfer.create({
|
||||
container: '#' + $(wavecontainer).attr('id') + ' .waveform'
|
||||
container: '#' + $(wavecontainer).attr('id') + ' .waveform',
|
||||
audioRate: settings.audioRate,
|
||||
autoCenter: settings.autoCenter,
|
||||
barGap: settings.barGap,
|
||||
barHeight: settings.barHeight,
|
||||
barWidth: settings.barWidth,
|
||||
cursorColor: settings.cursorColor,
|
||||
cursorWidth: settings.cursorWidth,
|
||||
forceDecode: settings.forceDecode,
|
||||
normalize: settings.normalize,
|
||||
progressColor: settings.progressColor,
|
||||
responsive: settings.responsive,
|
||||
waveColor: settings.waveColor
|
||||
});
|
||||
|
||||
wavesurfer.load(file.path);
|
||||
|
||||
wavesurfer.setVolume(settings.volume);
|
||||
|
||||
$(wavecontainer).find('.player-button.playpause').on('click', function () {
|
||||
$(wavecontainer).find('.player-button.playpause').on('click', function (event) {
|
||||
Drupal.AudiofieldWavesurfer.PlayPause(wavecontainer, wavesurfer);
|
||||
});
|
||||
|
||||
$(wavecontainer).find('.volume').on('change', function () {
|
||||
$(wavecontainer).find('.volume').on('change', function (event) {
|
||||
wavesurfer.setVolume($(event.currentTarget).val() / 10);
|
||||
});
|
||||
|
||||
@@ -37,7 +49,19 @@
|
||||
Drupal.AudiofieldWavesurfer.generatePlaylist = function (context, settings) {
|
||||
$.each($(context).find('#wavesurfer_playlist').once('generate-waveform'), function (index, wavecontainer) {
|
||||
var wavesurfer = WaveSurfer.create({
|
||||
container: '#' + $(wavecontainer).attr('id') + ' .waveform'
|
||||
container: '#' + $(wavecontainer).attr('id') + ' .waveform',
|
||||
audioRate: settings.audioRate,
|
||||
autoCenter: settings.autoCenter,
|
||||
barGap: settings.barGap,
|
||||
barHeight: settings.barHeight,
|
||||
barWidth: settings.barWidth,
|
||||
cursorColor: settings.cursorColor,
|
||||
cursorWidth: settings.cursorWidth,
|
||||
forceDecode: settings.forceDecode,
|
||||
normalize: settings.normalize,
|
||||
progressColor: settings.progressColor,
|
||||
responsive: settings.responsive,
|
||||
waveColor: settings.waveColor
|
||||
});
|
||||
|
||||
wavesurfer.setVolume(settings.volume);
|
||||
@@ -51,24 +75,27 @@
|
||||
|
||||
wavesurfer.load(first.attr('data-src'));
|
||||
|
||||
$(wavecontainer).find('.player-button.playpause').on('click', function () {
|
||||
$(wavecontainer).find('.player-button.playpause').on('click', function (event) {
|
||||
Drupal.AudiofieldWavesurfer.PlayPause(wavecontainer, wavesurfer);
|
||||
});
|
||||
|
||||
$(wavecontainer).find('.player-button.next').on('click', function () {
|
||||
$(wavecontainer).find('.player-button.next').on('click', function (event) {
|
||||
Drupal.AudiofieldWavesurfer.Next(wavecontainer, wavesurfer);
|
||||
});
|
||||
$(wavecontainer).find('.player-button.previous').on('click', function () {
|
||||
$(wavecontainer).find('.player-button.previous').on('click', function (event) {
|
||||
Drupal.AudiofieldWavesurfer.Previous(wavecontainer, wavesurfer);
|
||||
});
|
||||
|
||||
$(wavecontainer).find('.playlist .track').on('click', function () {
|
||||
Drupal.AudiofieldWavesurfer.Load(wavecontainer, wavesurfer, $(event.currentTarget));
|
||||
|
||||
Drupal.AudiofieldWavesurfer.PlayPause(wavecontainer, wavesurfer);
|
||||
$(wavecontainer).find('.playlist .track').on('click', function (event) {
|
||||
if ($(this).hasClass('playing')) {
|
||||
Drupal.AudiofieldWavesurfer.PlayPause(wavecontainer, wavesurfer);
|
||||
}
|
||||
else {
|
||||
Drupal.AudiofieldWavesurfer.Load(wavecontainer, wavesurfer, $(event.currentTarget));
|
||||
}
|
||||
});
|
||||
|
||||
$(wavecontainer).find('.volume').on('change', function () {
|
||||
$(wavecontainer).find('.volume').on('change', function (event) {
|
||||
wavesurfer.setVolume($(event.currentTarget).val() / 10);
|
||||
});
|
||||
|
||||
@@ -76,7 +103,7 @@
|
||||
wavesurfer.on('ready', wavesurfer.play.bind(wavesurfer));
|
||||
}
|
||||
|
||||
wavesurfer.on('finish', function () {
|
||||
wavesurfer.on('finish', function (event) {
|
||||
Drupal.AudiofieldWavesurfer.Next(wavecontainer, wavesurfer);
|
||||
});
|
||||
});
|
||||
@@ -95,13 +122,13 @@
|
||||
};
|
||||
|
||||
Drupal.AudiofieldWavesurfer.Load = function (wavecontainer, wavesurfer, track) {
|
||||
wavesurfer.on('ready', function () {
|
||||
wavesurfer.play();
|
||||
wavesurfer.load(track.attr('data-src'));
|
||||
wavesurfer.on('ready', function (event) {
|
||||
$(wavecontainer).removeClass('playing');
|
||||
$(wavecontainer).addClass('playing');
|
||||
$(wavecontainer).find('.player-button.playpause').html('Pause');
|
||||
wavesurfer.play();
|
||||
});
|
||||
wavesurfer.load(track.attr('data-src'));
|
||||
|
||||
$(wavecontainer).find('.track').removeClass('playing');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user