Skip to content

Commit

Permalink
Updated versioning to jPlayer 2.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
thepag committed Apr 2, 2014
1 parent 47ca9d9 commit 3d3fe2d
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions actionscript/Jplayer.as
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions actionscript/happyworm/jPlayer/JplayerStatus.as
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion jplayer.jquery.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"html5",
"streaming"
],
"version": "2.5.6",
"version": "2.6.0",
"author": {
"name": "Mark J Panaghiston",
"email": "[email protected]",
Expand Down
Binary file modified jquery.jplayer/Jplayer.swf
Binary file not shown.
8 changes: 4 additions & 4 deletions jquery.jplayer/jquery.jplayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/ */
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down

0 comments on commit 3d3fe2d

Please sign in to comment.