Skip to content
Browse files

Fix: setMedia media URLs must be truethy before abs url.

  • Loading branch information...
1 parent d44ea7c commit 26e245584b69103043ce8cbd4eb7f702037df565 @thepag thepag committed Jan 9, 2014
Showing with 8 additions and 8 deletions.
  1. +1 −1 bower.json
  2. +1 −1 jplayer.jquery.json
  3. +5 −5 jquery.jplayer/jquery.jplayer.js
  4. +1 −1 package.json
View
2 bower.json
@@ -1,6 +1,6 @@
{
"name": "jPlayer",
- "version": "2.5.3",
+ "version": "2.5.4",
"main": [
"./jquery.jplayer/jquery.jplayer.js",
"./skin/pink.flag/jplayer.pink.flag.css"
View
2 jplayer.jquery.json
@@ -11,7 +11,7 @@
"html5",
"streaming"
],
- "version": "2.5.3",
+ "version": "2.5.4",
"author": {
"name": "Mark J Panaghiston",
"email": "markp@happyworm.com",
View
10 jquery.jplayer/jquery.jplayer.js
@@ -2,13 +2,13 @@
* jPlayer Plugin for jQuery JavaScript Library
* http://www.jplayer.org
*
- * Copyright (c) 2009 - 2013 Happyworm Ltd
+ * Copyright (c) 2009 - 2014 Happyworm Ltd
* Licensed under the MIT license.
* http://opensource.org/licenses/MIT
*
* Author: Mark J Panaghiston
- * Version: 2.5.3
- * Date: 30th December 2013
+ * Version: 2.5.4
+ * Date: 9th January 2014
*/
/* Code verified using http://www.jshint.com/ */
@@ -470,7 +470,7 @@
$.jPlayer.prototype = {
count: 0, // Static Variable: Change it via prototype.
version: { // Static Object
- script: "2.5.3",
+ script: "2.5.4",
needFlash: "2.5.2",
flash: "unknown"
},
@@ -1669,7 +1669,7 @@
_absoluteMediaUrls: function(media) {
var self = this;
$.each(media, function(type, url) {
- if(self.format[type]) {
+ if(url && self.format[type]) {
media[type] = self._qualifyURL(url);
}
});
View
2 package.json
@@ -1,6 +1,6 @@
{
"name": "jplayer",
- "version": "2.5.3",
+ "version": "2.5.4",
"description": "The jQuery HTML5 Audio / Video Library",
"homepage": "http://www.jplayer.org/",
"keywords": [

0 comments on commit 26e2455

Please sign in to comment.
Something went wrong with that request. Please try again.