Skip to content

Commit

Permalink
Merge branch 'dev': audio player restored, jQuery icons using wrong p…
Browse files Browse the repository at this point in the history 
…ath.
  • Loading branch information
@HugoFara
HugoFara committed Nov 19, 2022
2 parents 2a1cde6 + 400b89c commit 3806bfa
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion css/jplayer.css
View file

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

2 changes: 1 addition & 1 deletion css/jquery-ui.css
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ For git tags, official releases are marked like "v1.0.0", while unofficial ones
* The ability to use a dictionary with a specific encoding, introduced in 1.0.2, is being removed. It was making things overwhelmingly complex and caused issues, as signaled in [#58](https://github.com/HugoFara/lwt/issues/58). Adapted from PR [#59](https://github.com/HugoFara/lwt/pull/59).

### Fixed
* The *audio* player was no onger working since 2.1.0-fork since the play button was hidden.
* Testing specific terms was broken ([#66](https://github.com/HugoFara/lwt/issues/66)) and tests were sometimes not counting score. Solution inspired from PR [#67](https://github.com/HugoFara/lwt/issues/67) from [@jzohrab](https://github.com/jzohrab).
* Right frames should hide automatically but they often don't [#61](https://github.com/HugoFara/lwt/issues/61). Merge PR (#62)[https://github.com/HugoFara/lwt/pull/62].
* You should also see less annoying console messages of "cClick" crashing.
* Right frames should hide automatically but they often don't ([#61](https://github.com/HugoFara/lwt/issues/61)). Merged PR (#62)[https://github.com/HugoFara/lwt/pull/62].
* You should no longer see annoying console messages of "cClick" crashing on "obj is null".
* Save text position (``inc/ajax_save_text_position.php``) was broken for all texts. This is fixed.
* Type fixes thanks to psalm:
* ``get_first_value`` documentation updated since it was also returning ``float`` and ``int``.
Expand All @@ -39,7 +40,6 @@ For git tags, official releases are marked like "v1.0.0", while unofficial ones
* Unconsistent option in ``inc/ajax_save_setting.php``.
* Since 2.2.2-fork, you had to use a GET request to use it, resulting in authorization errors.
* POST requests are now again the default way to use it.
* Removed the last JS error messages of "obj is null" when calling ``cClick``.
* Sometimes tests were loop-reloading clicking after setting new status, this is fixed.


Expand Down
6 changes: 3 additions & 3 deletions docs/info.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1949,10 +1949,11 @@ <h4>Removed</h4>
</ul>
<h4>Fixed</h4>
<ul>
<li>The <em>audio</em> player was no onger working since 2.1.0-fork since the play button was hidden.</li>
<li>Testing specific terms was broken (<a href="https://github.com/HugoFara/lwt/issues/66">#66</a>) and tests were sometimes not counting score. Solution inspired from PR <a href="https://github.com/HugoFara/lwt/issues/67">#67</a> from <a href="https://github.com/jzohrab">@jzohrab</a>.</li>
<li>Right frames should hide automatically but they often don't <a href="https://github.com/HugoFara/lwt/issues/61">#61</a>. Merge PR (#62)[https://github.com/HugoFara/lwt/pull/62].
<li>Right frames should hide automatically but they often don't (<a href="https://github.com/HugoFara/lwt/issues/61">#61</a>). Merged PR (#62)[https://github.com/HugoFara/lwt/pull/62].
<ul>
<li>You should also see less annoying console messages of "cClick" crashing.</li>
<li>You should no longer see annoying console messages of "cClick" crashing on "obj is null".</li>
</ul>
</li>
<li>Save text position (<code>inc/ajax_save_text_position.php</code>) was broken for all texts. This is fixed.</li>
Expand All @@ -1972,7 +1973,6 @@ <h4>Fixed</h4>
<li>POST requests are now again the default way to use it.</li>
</ul>
</li>
<li>Removed the last JS error messages of "obj is null" when calling <code>cClick</code>.</li>
<li>Sometimes tests were loop-reloading clicking after setting new status, this is fixed.</li>
</ul>
<h3>2.5.3-fork (November 06 2022)</h3>
Expand Down
8 changes: 4 additions & 4 deletions inc/session_utility.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1636,13 +1636,13 @@ function selectmediapath($f): string
if (is_dir('media')) {
$msg = '';
} else {
$msg = '<br />[Error: ".../' . basename(getcwd()) . '/media" exists, but it is not a directory.]';
$msg = '<br />[Error: "../' . basename(getcwd()) . '/media" exists, but it is not a directory.]';
}
} else {
$msg = '<br />[Directory ".../' . basename(getcwd()) . '/media" does not yet exist.]';
$msg = '<br />[Directory "../' . basename(getcwd()) . '/media" does not yet exist.]';
}
$r = '<p>
YouTube, Dailymotion, Vimeo or choose a file in ".../' . basename(getcwd()) . '/media"
YouTube, Dailymotion, Vimeo or choose a file in "../' . basename(getcwd()) . '/media"
<br />
(only mp3, mp4, ogg, wav, webm files shown):
</p> ' . $msg;
Expand Down Expand Up @@ -4625,7 +4625,7 @@ function makeAudioPlayer($audio, $offset=0)
<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;-khtml-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;">
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>
</td>
<td class="center bordermiddle">&nbsp;</td>
Expand Down
38 changes: 19 additions & 19 deletions src/css/jplayer.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,17 @@ div.jp-audio div.jp-type-playlist a.jp-pause {
left:10px; /* 48 */
}
a.jp-play {
background: url("./images/jplayer.blue.monday.jpg") 0 0 no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") 0 0 no-repeat;
}
a.jp-play:hover {
background: url("./images/jplayer.blue.monday.jpg") -41px 0 no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") -41px 0 no-repeat;
}
a.jp-pause {
background: url("./images/jplayer.blue.monday.jpg") 0 -42px no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") 0 -42px no-repeat;
display: none;
}
a.jp-pause:hover {
background: url("./images/jplayer.blue.monday.jpg") -41px -42px no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") -41px -42px no-repeat;
}
div.jp-audio div.jp-type-single a.jp-stop {
top:11px;
Expand All @@ -93,37 +93,37 @@ div.jp-audio div.jp-type-playlist a.jp-stop {
left:88px; /* 90 */
}
a.jp-stop {
background: url("./images/jplayer.blue.monday.jpg") 0 -83px no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") 0 -83px no-repeat;
width:28px;
height:28px;
z-index:1;
}
a.jp-stop:hover {
background: url("./images/jplayer.blue.monday.jpg") -29px -83px no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") -29px -83px no-repeat;
}
div.jp-audio div.jp-type-playlist a.jp-previous {
left:20px;
top:26px;
}
a.jp-previous {
background: url("./images/jplayer.blue.monday.jpg") 0 -112px no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") 0 -112px no-repeat;
width:28px;
height:28px;
}
a.jp-previous:hover {
background: url("./images/jplayer.blue.monday.jpg") -29px -112px no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") -29px -112px no-repeat;
}
div.jp-audio div.jp-type-playlist a.jp-next {
left:88px;
top:26px;
}
a.jp-next {
background: url("./images/jplayer.blue.monday.jpg") 0 -141px no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") 0 -141px no-repeat;
width:28px;
height:28px;
}
a.jp-next:hover {
background: url("./images/jplayer.blue.monday.jpg") -29px -141px no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") -29px -141px no-repeat;
}
div.jp-progress {
position: absolute;
Expand All @@ -143,18 +143,18 @@ div.jp-audio div.jp-type-playlist div.jp-progress {
height:15px;
}
div.jp-seek-bar {
background: url("./images/jplayer.blue.monday.jpg") 0 -202px repeat-x;
background: url("../../css/images/jplayer.blue.monday.jpg") 0 -202px repeat-x;
width:0px;
height:100%;
cursor: pointer;
}
div.jp-play-bar {
background: url("./images/jplayer.blue.monday.jpg") 0 -218px repeat-x ;
background: url("../../css/images/jplayer.blue.monday.jpg") 0 -218px repeat-x ;
width:0px;
height:100%;
}
div.jp-seeking-bg {
background: url("./images/pbar-ani.gif");
background: url("../../css/images/pbar-ani.gif");
}
a.jp-mute,
a.jp-unmute {
Expand All @@ -172,22 +172,22 @@ div.jp-audio div.jp-type-playlist a.jp-unmute {
left:246px; /* 296 */
}
a.jp-mute {
background: url("./images/jplayer.blue.monday.jpg") 0 -186px no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") 0 -186px no-repeat;
}
a.jp-mute:hover {
background: url("./images/jplayer.blue.monday.jpg") -0.97em -186px no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") -0.97em -186px no-repeat;
}
a.jp-unmute {
background: url("./images/jplayer.blue.monday.jpg") 0 -170px no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") 0 -170px no-repeat;
display: none;
}
a.jp-unmute:hover {
background: url("./images/jplayer.blue.monday.jpg") -0.97em -170px no-repeat;
background: url("../../css/images/jplayer.blue.monday.jpg") -0.97em -170px no-repeat;
}
div.jp-volume-bar {
position: absolute;
overflow:hidden;
background: url("./images/jplayer.blue.monday.jpg") 0 -202px repeat-x; /* -250 */
background: url("../../css/images/jplayer.blue.monday.jpg") 0 -202px repeat-x; /* -250 */
width:46px;
height:10px;
cursor: pointer;
Expand All @@ -201,7 +201,7 @@ div.jp-audio div.jp-type-playlist div.jp-volume-bar {
left:274px; /* 324 */
}
div.jp-volume-bar-value {
background: url("./images/jplayer.blue.monday.jpg") 0 -218px repeat-x; /* -256 */
background: url("../../css/images/jplayer.blue.monday.jpg") 0 -218px repeat-x; /* -256 */
width:0px;
height:10px;
}
Expand Down
Loading

0 comments on commit 3806bfa

Please sign in to comment.