Skip to content

Commit 26e2455

Browse files
committed
Fix: setMedia media URLs must be truethy before abs url.
1 parent d44ea7c commit 26e2455

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jPlayer",
3-
"version": "2.5.3",
3+
"version": "2.5.4",
44
"main": [
55
"./jquery.jplayer/jquery.jplayer.js",
66
"./skin/pink.flag/jplayer.pink.flag.css"

jplayer.jquery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"html5",
1212
"streaming"
1313
],
14-
"version": "2.5.3",
14+
"version": "2.5.4",
1515
"author": {
1616
"name": "Mark J Panaghiston",
1717
"email": "markp@happyworm.com",

jquery.jplayer/jquery.jplayer.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
* jPlayer Plugin for jQuery JavaScript Library
33
* http://www.jplayer.org
44
*
5-
* Copyright (c) 2009 - 2013 Happyworm Ltd
5+
* Copyright (c) 2009 - 2014 Happyworm Ltd
66
* Licensed under the MIT license.
77
* http://opensource.org/licenses/MIT
88
*
99
* Author: Mark J Panaghiston
10-
* Version: 2.5.3
11-
* Date: 30th December 2013
10+
* Version: 2.5.4
11+
* Date: 9th January 2014
1212
*/
1313

1414
/* Code verified using http://www.jshint.com/ */
@@ -470,7 +470,7 @@
470470
$.jPlayer.prototype = {
471471
count: 0, // Static Variable: Change it via prototype.
472472
version: { // Static Object
473-
script: "2.5.3",
473+
script: "2.5.4",
474474
needFlash: "2.5.2",
475475
flash: "unknown"
476476
},
@@ -1669,7 +1669,7 @@
16691669
_absoluteMediaUrls: function(media) {
16701670
var self = this;
16711671
$.each(media, function(type, url) {
1672-
if(self.format[type]) {
1672+
if(url && self.format[type]) {
16731673
media[type] = self._qualifyURL(url);
16741674
}
16751675
});

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jplayer",
3-
"version": "2.5.3",
3+
"version": "2.5.4",
44
"description": "The jQuery HTML5 Audio / Video Library",
55
"homepage": "http://www.jplayer.org/",
66
"keywords": [

0 commit comments

Comments
 (0)