Permalink
Browse files

Updated versions to 2.3.0 and final jshint.org review.

  • Loading branch information...
1 parent 446ee41 commit c1c7a4dfa63bb6684d3670202e4a65d400dfce86 @thepag thepag committed Apr 20, 2013
View
@@ -8,8 +8,8 @@
* - http://www.gnu.org/copyleft/gpl.html
*
* Author: Mark J Panaghiston
- * Version: 2.2.23
- * Date: 12th April 2013
+ * Version: 2.3.0
+ * Date: 20th April 2013
*
* FlashVars expected: (AS3 property of: loaderInfo.parameters)
* id: (URL Encoded: String) Id of jPlayer instance
@@ -8,13 +8,13 @@
* - http://www.gnu.org/copyleft/gpl.html
*
* Author: Mark J Panaghiston
- * Date: 21st March 2013
+ * Date: 20th April 2013
*/
package happyworm.jPlayer {
public class JplayerStatus {
- public static const VERSION:String = "2.2.23"; // The version of the Flash jPlayer entity.
+ public static const VERSION:String = "2.3.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()
View
@@ -8,17 +8,17 @@
* - http://www.gnu.org/copyleft/gpl.html
*
* Author: Mark J Panaghiston
- * Version: 2.2.2
- * Date: 30th January 2013
+ * Version: 2.3.0
+ * Date: 20th April 2013
*
* Requires:
* - jQuery 1.7.0+
- * - jPlayer 2.2.19+
+ * - jPlayer 2.3.0+
*/
/* Code verified using http://www.jshint.com/ */
-/*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 */
-/*global jPlayerPlaylist: true */
+/*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 */
+/*global jPlayerPlaylist:true */
(function($, undefined) {
View
Binary file not shown.
@@ -8,8 +8,8 @@
* - http://www.gnu.org/copyleft/gpl.html
*
* Author: Mark J Panaghiston
- * Version: 2.2.24
- * Date: 12th April 2013
+ * Version: 2.3.0
+ * Date: 20th April 2013
*/
/* Code verified using http://www.jshint.com/ */
@@ -454,8 +454,8 @@
$.jPlayer.prototype = {
count: 0, // Static Variable: Change it via prototype.
version: { // Static Object
- script: "2.2.24",
- needFlash: "2.2.23",
+ script: "2.3.0",
+ needFlash: "2.3.0",
flash: "unknown"
},
options: { // Instanced in $.jPlayer() constructor
View
@@ -1,6 +1,6 @@
{
"name": "jplayer",
- "version": "2.2.5",
+ "version": "2.3.0",
"description": "The jQuery HTML5 Audio / Video Library",
"homepage": "http://www.jplayer.org/",
"keywords": [
@@ -2,35 +2,35 @@
* jPlayer Player Plugin for Popcorn JavaScript Library
* http://www.jplayer.org
*
- * Copyright (c) 2012 Happyworm Ltd
+ * Copyright (c) 2013 Happyworm Ltd
* Dual licensed under the MIT and GPL licenses.
* - http://www.opensource.org/licenses/mit-license.php
* - http://www.gnu.org/copyleft/gpl.html
*
* Author: Mark J Panaghiston
- * Version: 1.0.0
- * Date: 13th September 2012
+ * Version: 1.1.0
+ * Date: 20th April 2013
*
* For Popcorn Version: 1.3
- * For jPlayer Version: 2.2.0
+ * For jPlayer Version: 2.3.0
* Requires: jQuery 1.3.2+
* Note: jQuery dependancy cannot be removed since jPlayer 2 is a jQuery plugin. Use of jQuery will be kept to a minimum.
*/
/* Code verified using http://www.jshint.com/ */
-/*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 */
-/*global Popcorn:false */
+/*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 */
+/*global Popcorn:false, console:false */
(function(Popcorn) {
var JQUERY_SCRIPT = 'http://ajax.googleapis.com/ajax/libs/jquery/1.8/jquery.min.js', // Used if jQuery not already present.
- JPLAYER_SCRIPT = 'http://www.jplayer.org/2.2.0/js/jquery.jplayer.min.js', // Used if jPlayer not already present.
- JPLAYER_SWFPATH = 'http://www.jplayer.org/2.2.0/js/Jplayer.swf', // Used if not specified in jPlayer options via SRC Object.
+ JPLAYER_SCRIPT = 'http://www.jplayer.org/2.3.0/js/jquery.jplayer.min.js', // Used if jPlayer not already present.
+ JPLAYER_SWFPATH = 'http://www.jplayer.org/2.3.0/js/Jplayer.swf', // Used if not specified in jPlayer options via SRC Object.
SOLUTION = 'html,flash', // The default solution option.
DEBUG = false, // Decided to leave the debugging option and console output in for the time being. Overhead is trivial.
jQueryDownloading = false, // Flag to stop multiple instances from each pulling in jQuery, thus corrupting it.
jPlayerDownloading = false, // Flag to stop multiple instances from each pulling in jPlayer, thus corrupting it.
- format = { // Duplicate of jPlayer 2.2.0 object, to avoid always requiring jQuery and jPlayer to be loaded before performing the _canPlayType() test.
+ format = { // Duplicate of jPlayer 2.3.0 object, to avoid always requiring jQuery and jPlayer to be loaded before performing the _canPlayType() test.
mp3: {
codec: 'audio/mpeg; codecs="mp3"',
flashCanPlay: true,

0 comments on commit c1c7a4d

Please sign in to comment.