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

[BUG] Jplayer buttons #191

Merged
merged 1 commit into from
Jan 11, 2024
Merged

[BUG] Jplayer buttons #191

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
36 changes: 7 additions & 29 deletions inc/session_utility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3946,13 +3946,13 @@ function makeAudioPlayer($audio, $offset=0)
<tr>
<td class="center borderleft" style="padding-left:10px;">
<span id="do-single" class="click<?php echo ($repeatMode ? '' : ' hide'); ?>"
style="color:#09F;font-weight: bold;" title="Toggle Repeat (Now ON)">↻
style="color:#09F;font-weight: bold;" title="Toggle Repeat (Now ON)">
<img src="icn/arrow-repeat.png" alt="Toggle Repeat (Now ON)" title="Toogle Repeat (Now ON)" style="width:24px;height:24px;">
</span>
<span id="do-repeat" class="click<?php echo ($repeatMode ? ' hide' : ''); ?>"
style="color:grey;font-weight: bold;" title="Toggle Repeat (Now OFF)">↻</span>
<div id="playbackrateContainer"
style="font-size: 80%;position:relative;-webkit-touch-callout: none;-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;">
</div>
style="color:grey;font-weight: bold;" title="Toggle Repeat (Now OFF)">
<img src="icn/arrow-norepeat.png" alt="Toggle Repeat (Now OFF)" title="Toggle Repeat (Now OFF)" style="width:24px;height:24px;">
</span>
</td>
<td class="center bordermiddle">&nbsp;</td>
<td class="bordermiddle">
Expand Down Expand Up @@ -4069,28 +4069,6 @@ function addjPlayerMedia () {
$(this)
.jPlayer("setMedia", media_obj)
.jPlayer("pause", MEDIA_OFFSET);
if ($('#jquery_jplayer_1').data().jPlayer.status.playbackRateEnabled) {
$("#playbackrateContainer").css("margin-top",".2em")
.html(
`<span id="pbSlower"
style="position:absolute;top: 0; left: 0; bottom: 0; right: 50%;"
title="Slower" onclick="lwt_audio_controller.clickSlower();">
&nbsp;
</span>
<span id="pbFaster"
style="position:absolute;top: 0; left: 50%; bottom: 0; right: 0;"
title="Faster" onclick="lwt_audio_controller.clickFaster();">
&nbsp;
</span>
<span class="ui-widget ui-state-default ui-corner-all"
style="padding-left: 0.2em;padding-right: 0.2em;color:grey">
<span id="playbackSlower" style="padding-right: 0.15em;">≪</span>
<span id="pbvalue">1.0</span>
<span id="playbackFaster" style="padding-left: 0.15em;">≫</span>
</span>`
)
.css("cursor", "pointer");
}
}

/**
Expand All @@ -4112,12 +4090,12 @@ function prepareMediaInteractions() {
});

$("#jquery_jplayer_1")
.on('bind', $.jPlayer.event.timeupdate, function(event) {
.on($.jPlayer.event.timeupdate, function(event) {
$("#playTime").text(Math.floor(event.jPlayer.status.currentTime));
});

$("#jquery_jplayer_1")
.on('bind', $.jPlayer.event.play, function(event) {
.on($.jPlayer.event.play, function(event) {
lwt_audio_controller.setCurrentPlaybackRate();
});

Expand Down
2 changes: 1 addition & 1 deletion js/pgm.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/js/audio_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ const lwt_audio_controller = {
},

clickSingle: function () {
$('#jquery_jplayer_1').off('bind', $.jPlayer.event.ended + '.jp-repeat');
$('#jquery_jplayer_1').off($.jPlayer.event.ended + '.jp-repeat');
$('#do-single').addClass('hide');
$('#do-repeat').removeClass('hide');
do_ajax_save_setting('currentplayerrepeatmode', '0');
},

clickRepeat: function () {
$('#jquery_jplayer_1')
.on('bind', $.jPlayer.event.ended + '.jp-repeat', function () {
.on($.jPlayer.event.ended + '.jp-repeat', function () {
$('#jquery_jplayer_1').jPlayer('play');
});
$('#do-repeat').addClass('hide');
Expand Down