Skip to content

Commit c1c7a4d

Browse files
thepagthepag
committed
Updated versions to 2.3.0 and final jshint.org review.
1 parent 446ee41 commit c1c7a4d

7 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎actionscript/Jplayer.as‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* - http://www.gnu.org/copyleft/gpl.html
99
*
1010
* Author: Mark J Panaghiston
11-
* Version: 2.2.23
12-
* Date: 12th April 2013
11+
* Version: 2.3.0
12+
* Date: 20th April 2013
1313
*
1414
* FlashVars expected: (AS3 property of: loaderInfo.parameters)
1515
* id: (URL Encoded: String) Id of jPlayer instance

‎actionscript/happyworm/jPlayer/JplayerStatus.as‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
* - http://www.gnu.org/copyleft/gpl.html
99
*
1010
* Author: Mark J Panaghiston
11-
* Date: 21st March 2013
11+
* Date: 20th April 2013
1212
*/
1313

1414
package happyworm.jPlayer {
1515
public class JplayerStatus {
1616

17-
public static const VERSION:String = "2.2.23"; // The version of the Flash jPlayer entity.
17+
public static const VERSION:String = "2.3.0"; // The version of the Flash jPlayer entity.
1818

1919
public var volume:Number = 0.5; // Not affected by reset()
2020
public var muted:Boolean = false; // Not affected by reset()

‎add-on/jplayer.playlist.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
* - http://www.gnu.org/copyleft/gpl.html
99
*
1010
* Author: Mark J Panaghiston
11-
* Version: 2.2.2
12-
* Date: 30th January 2013
11+
* Version: 2.3.0
12+
* Date: 20th April 2013
1313
*
1414
* Requires:
1515
* - jQuery 1.7.0+
16-
* - jPlayer 2.2.19+
16+
* - jPlayer 2.3.0+
1717
*/
1818

1919
/* Code verified using http://www.jshint.com/ */
20-
/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:true, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false smarttabs:true */
21-
/*global jPlayerPlaylist: true */
20+
/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:true, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false, smarttabs:true */
21+
/*global jPlayerPlaylist:true */
2222

2323
(function($, undefined) {
2424

‎jquery.jplayer/Jplayer.swf‎

-1 Bytes
Binary file not shown.

‎jquery.jplayer/jquery.jplayer.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* - http://www.gnu.org/copyleft/gpl.html
99
*
1010
* Author: Mark J Panaghiston
11-
* Version: 2.2.24
12-
* Date: 12th April 2013
11+
* Version: 2.3.0
12+
* Date: 20th April 2013
1313
*/
1414

1515
/* Code verified using http://www.jshint.com/ */
@@ -454,8 +454,8 @@
454454
$.jPlayer.prototype = {
455455
count: 0, // Static Variable: Change it via prototype.
456456
version: { // Static Object
457-
script: "2.2.24",
458-
needFlash: "2.2.23",
457+
script: "2.3.0",
458+
needFlash: "2.3.0",
459459
flash: "unknown"
460460
},
461461
options: { // Instanced in $.jPlayer() constructor

‎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.2.5",
3+
"version": "2.3.0",
44
"description": "The jQuery HTML5 Audio / Video Library",
55
"homepage": "http://www.jplayer.org/",
66
"keywords": [

‎popcorn/player/popcorn.jplayer.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22
* jPlayer Player Plugin for Popcorn JavaScript Library
33
* http://www.jplayer.org
44
*
5-
* Copyright (c) 2012 Happyworm Ltd
5+
* Copyright (c) 2013 Happyworm Ltd
66
* Dual licensed under the MIT and GPL licenses.
77
* - http://www.opensource.org/licenses/mit-license.php
88
* - http://www.gnu.org/copyleft/gpl.html
99
*
1010
* Author: Mark J Panaghiston
11-
* Version: 1.0.0
12-
* Date: 13th September 2012
11+
* Version: 1.1.0
12+
* Date: 20th April 2013
1313
*
1414
* For Popcorn Version: 1.3
15-
* For jPlayer Version: 2.2.0
15+
* For jPlayer Version: 2.3.0
1616
* Requires: jQuery 1.3.2+
1717
* Note: jQuery dependancy cannot be removed since jPlayer 2 is a jQuery plugin. Use of jQuery will be kept to a minimum.
1818
*/
1919

2020
/* Code verified using http://www.jshint.com/ */
21-
/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:false, debug:false, devel:true, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:false, noarg:true, noempty:false, nonew:true, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false smarttabs:true */
22-
/*global Popcorn:false */
21+
/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:false, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false, smarttabs:true */
22+
/*global Popcorn:false, console:false */
2323

2424
(function(Popcorn) {
2525

2626
var JQUERY_SCRIPT = 'http://ajax.googleapis.com/ajax/libs/jquery/1.8/jquery.min.js', // Used if jQuery not already present.
27-
JPLAYER_SCRIPT = 'http://www.jplayer.org/2.2.0/js/jquery.jplayer.min.js', // Used if jPlayer not already present.
28-
JPLAYER_SWFPATH = 'http://www.jplayer.org/2.2.0/js/Jplayer.swf', // Used if not specified in jPlayer options via SRC Object.
27+
JPLAYER_SCRIPT = 'http://www.jplayer.org/2.3.0/js/jquery.jplayer.min.js', // Used if jPlayer not already present.
28+
JPLAYER_SWFPATH = 'http://www.jplayer.org/2.3.0/js/Jplayer.swf', // Used if not specified in jPlayer options via SRC Object.
2929
SOLUTION = 'html,flash', // The default solution option.
3030
DEBUG = false, // Decided to leave the debugging option and console output in for the time being. Overhead is trivial.
3131
jQueryDownloading = false, // Flag to stop multiple instances from each pulling in jQuery, thus corrupting it.
3232
jPlayerDownloading = false, // Flag to stop multiple instances from each pulling in jPlayer, thus corrupting it.
33-
format = { // Duplicate of jPlayer 2.2.0 object, to avoid always requiring jQuery and jPlayer to be loaded before performing the _canPlayType() test.
33+
format = { // Duplicate of jPlayer 2.3.0 object, to avoid always requiring jQuery and jPlayer to be loaded before performing the _canPlayType() test.
3434
mp3: {
3535
codec: 'audio/mpeg; codecs="mp3"',
3636
flashCanPlay: true,

0 commit comments

Comments
 (0)