Skip to content

Commit 28e32e2

Browse files
author
coding-chimp
committed
Updates assets
1 parent ec7b0f1 commit 28e32e2

File tree

8 files changed

+46
-16
lines changed

8 files changed

+46
-16
lines changed

vendor/assets/images/bigplay.png

100755100644
File mode changed.

vendor/assets/images/bigplay.svg

100755100644
File mode changed.

vendor/assets/images/controls.png

100755100644
File mode changed.

vendor/assets/images/controls.svg

100755100644
File mode changed.

vendor/assets/javascripts/podlove-web-player-rails/hashchange.min.js

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//= require podlove-web-player-rails/hashchange.min
12
//= require podlove-web-player-rails/html5shiv
23
//= require podlove-web-player-rails/mediaelement-and-player
34
//= require podlove-web-player-rails/podlove-web-player

vendor/assets/javascripts/podlove-web-player-rails/podlove-web-player.js

100755100644
Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
/*
22
* ===========================================
3-
* Podlove Web Player v2.0.15
3+
* Podlove Web Player v2.0.17
44
* Licensed under The BSD 2-Clause License
55
* http://opensource.org/licenses/BSD-2-Clause
66
* ===========================================
7+
* Copyright (c) 2013, Gerrit van Aaken (https://github.com/gerritvanaaken/), Simon Waldherr (https://github.com/simonwaldherr/), Frank Hase (https://github.com/Kambfhase/), Eric Teubert (https://github.com/eteubert/) and others (https://github.com/podlove/podlove-web-player/contributors)
8+
* All rights reserved.
9+
*
10+
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
11+
*
12+
* - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
13+
* - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
14+
*
15+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
716
*/
817

918

@@ -250,14 +259,13 @@ if (typeof String.prototype.trim !== 'function') {
250259
// required (minutes : seconds)
251260
part = zeroFill(minutes, 2) + ':' + zeroFill(seconds, 2);
252261
hours = zeroFill(hours, 2);
253-
hours = hours === '00' && !forceHours ? '' : hours + ':';
254-
milliseconds = milliseconds ? '.' + zeroFill(milliseconds, 3) : '';
262+
hours = hours === '00' && !forceHours ? '' : hours + ':';
255263
} else {
256264
part = hours ? zeroFill(minutes, 2) : minutes.toString();
257265
part += ':' + zeroFill(seconds, 2);
258266
hours = hours ? hours + ':' : '';
259-
milliseconds = milliseconds ? '.' + milliseconds : '';
260267
}
268+
milliseconds = milliseconds ? '.' + zeroFill(milliseconds, 3) : '';
261269
return hours + part + milliseconds;
262270
}
263271
if (times[1] > 0 && times[1] < 9999999 && times[0] < times[1]) {
@@ -584,8 +592,8 @@ if (typeof String.prototype.trim !== 'function') {
584592
jqPlayer.on('error', function () {
585593
if ($(this).attr('src')) {
586594
$(this).removeAttr('src');
587-
} else {
588-
$(this).children().first().remove();
595+
} else if($(this).children('source').length) {
596+
$(this).children('source').first().remove();
589597
}
590598
});
591599
/**

vendor/assets/stylesheets/podlove-web-player.css.scss

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
/*
22
* ===========================================
3-
* Podlove Web Player v2.0.15
3+
* Podlove Web Player v2.0.17
44
* Licensed under The BSD 2-Clause License
55
* http://opensource.org/licenses/BSD-2-Clause
66
* ===========================================
7+
* Copyright (c) 2013, Gerrit van Aaken (https://github.com/gerritvanaaken/), Simon Waldherr (https://github.com/simonwaldherr/), Frank Hase (https://github.com/Kambfhase/), Eric Teubert (https://github.com/eteubert/) and others (https://github.com/podlove/podlove-web-player/contributors)
8+
* All rights reserved.
9+
*
10+
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
11+
*
12+
* - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
13+
* - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
14+
*
15+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
716
*/
817

918

@@ -1001,8 +1010,11 @@
10011010
-webkit-text-size-adjust: inherit;
10021011
}
10031012

1004-
*, *:before, *:after {
1005-
-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
1013+
.podlovewebplayer_wrapper,
1014+
.podlovewebplayer_wrapper *,
1015+
.podlovewebplayer_wrapper *:before,
1016+
.podlovewebplayer_wrapper *:after {
1017+
-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
10061018
}
10071019

10081020
.podlovewebplayer_wrapper div {
@@ -1436,13 +1448,13 @@
14361448
}
14371449

14381450
.podlovewebplayer_wrapper .mejs-container .mejs-inner .mejs-controls .mejs-time-rail .mejs-time-total .mejs-time-loaded {
1439-
background: rgb(67,131,219);
1440-
background: -moz-linear-gradient(top, rgb(67,131,219) 0%, rgb(88,156,239) 100%);
1441-
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgb(67,131,219)), color-stop(100%,rgb(88,156,239)));
1442-
background: -webkit-linear-gradient(top, rgb(67,131,219) 0%,rgb(88,156,239) 100%);
1443-
background: -o-linear-gradient(top, rgb(67,131,219) 0%,rgb(88,156,239) 100%);
1444-
background: -ms-linear-gradient(top, rgb(67,131,219) 0%,rgb(88,156,239) 100%);
1445-
background: linear-gradient(to bottom, rgb(67,131,219) 0%,rgb(88,156,239) 100%);
1451+
background: #11B5DB;
1452+
background: -moz-linear-gradient(top, #11B5DB 0%, #589CEF 100%);
1453+
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#11B5DB), color-stop(100%,#589CEF));
1454+
background: -webkit-linear-gradient(top, #11B5DB 0%,#589CEF 100%);
1455+
background: -o-linear-gradient(top, #11B5DB 0%,#589CEF 100%);
1456+
background: -ms-linear-gradient(top, #11B5DB 0%,#589CEF 100%);
1457+
background: linear-gradient(to bottom, #11B5DB 0%,#589CEF 100%);
14461458
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cc4383db', endColorstr='#cc589cef',GradientType=0 );
14471459
}
14481460

0 commit comments

Comments
 (0)