diff --git a/actionscript/Jplayer.as b/actionscript/Jplayer.as index 1a0bd7ef..f07b1296 100644 --- a/actionscript/Jplayer.as +++ b/actionscript/Jplayer.as @@ -2,13 +2,13 @@ * jPlayer Plugin for jQuery JavaScript Library * http://www.jplayer.org * - * Copyright (c) 2009 - 2013 Happyworm Ltd - * Licensed under the MIT. + * Copyright (c) 2009 - 2014 Happyworm Ltd + * Licensed under the MIT license. * http://opensource.org/licenses/MIT * * Author: Mark J Panaghiston - * Version: 2.5.2 - * Date: 15th December 2013 + * Version: 2.6.0 + * Date: 2nd April 2014 * * FlashVars expected: (AS3 property of: loaderInfo.parameters) * id: (URL Encoded: String) Id of jPlayer instance diff --git a/actionscript/happyworm/jPlayer/JplayerStatus.as b/actionscript/happyworm/jPlayer/JplayerStatus.as index c31f055e..909816a7 100644 --- a/actionscript/happyworm/jPlayer/JplayerStatus.as +++ b/actionscript/happyworm/jPlayer/JplayerStatus.as @@ -2,18 +2,18 @@ * 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 - * Date: 15th Devember 2013 + * Date: 2nd April 2014 */ package happyworm.jPlayer { public class JplayerStatus { - public static const VERSION:String = "2.5.2"; // The version of the Flash jPlayer entity. + public static const VERSION:String = "2.6.0"; // The version of the Flash jPlayer entity. public var volume:Number = 0.5; // Not affected by reset() public var muted:Boolean = false; // Not affected by reset() diff --git a/bower.json b/bower.json index bc6eb809..f3454511 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "jPlayer", - "version": "2.5.6", + "version": "2.6.0", "main": [ "./jquery.jplayer/jquery.jplayer.js", "./skin/pink.flag/jplayer.pink.flag.css" diff --git a/jplayer.jquery.json b/jplayer.jquery.json index af6e1558..2657baac 100644 --- a/jplayer.jquery.json +++ b/jplayer.jquery.json @@ -11,7 +11,7 @@ "html5", "streaming" ], - "version": "2.5.6", + "version": "2.6.0", "author": { "name": "Mark J Panaghiston", "email": "markp@happyworm.com", diff --git a/jquery.jplayer/Jplayer.swf b/jquery.jplayer/Jplayer.swf index 9561b94c..cf7a4f4b 100644 Binary files a/jquery.jplayer/Jplayer.swf and b/jquery.jplayer/Jplayer.swf differ diff --git a/jquery.jplayer/jquery.jplayer.js b/jquery.jplayer/jquery.jplayer.js index 96248e98..2214019a 100644 --- a/jquery.jplayer/jquery.jplayer.js +++ b/jquery.jplayer/jquery.jplayer.js @@ -7,8 +7,8 @@ * http://opensource.org/licenses/MIT * * Author: Mark J Panaghiston - * Version: 2.5.6 - * Date: 1st April 2014 + * Version: 2.6.0 + * Date: 2nd April 2014 */ /* Code verified using http://www.jshint.com/ */ @@ -471,8 +471,8 @@ $.jPlayer.prototype = { count: 0, // Static Variable: Change it via prototype. version: { // Static Object - script: "2.5.6", - needFlash: "2.5.2", + script: "2.6.0", + needFlash: "2.6.0", flash: "unknown" }, options: { // Instanced in $.jPlayer() constructor diff --git a/package.json b/package.json index c91805d7..59a70c36 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jplayer", - "version": "2.5.6", + "version": "2.6.0", "description": "The jQuery HTML5 Audio / Video Library", "homepage": "http://www.jplayer.org/", "keywords": [