Skip to content

Commit

Permalink
Updated popcorn player for 2.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
thepag committed Apr 2, 2014
1 parent 3d3fe2d commit c93ae27
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions popcorn/player/popcorn.jplayer.js
Expand Up @@ -2,16 +2,16 @@
* jPlayer Player Plugin for Popcorn JavaScript Library
* http://www.jplayer.org
*
* Copyright (c) 2013 Happyworm Ltd
* Copyright (c) 2012 - 2014 Happyworm Ltd
* Licensed under the MIT license.
* http://opensource.org/licenses/MIT
*
* Author: Mark J Panaghiston
* Version: 1.1.2
* Date: 7th November 2013
* Version: 1.1.3
* Date: 2nd April 2014
*
* For Popcorn Version: 1.3
* For jPlayer Version: 2.5.0
* For jPlayer Version: 2.6.0
* Requires: jQuery 1.7+
* Note: jQuery dependancy cannot be removed since jPlayer 2 is a jQuery plugin. Use of jQuery will be kept to a minimum.
*/
Expand All @@ -22,9 +22,9 @@

(function(Popcorn) {

var JQUERY_SCRIPT = '//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js', // Used if jQuery not already present.
JPLAYER_SCRIPT = '//www.jplayer.org/2.5.0/js/jquery.jplayer.min.js', // Used if jPlayer not already present.
JPLAYER_SWFPATH = '//www.jplayer.org/2.5.0/js/Jplayer.swf', // Used if not specified in jPlayer options via SRC Object.
var JQUERY_SCRIPT = '//code.jquery.com/jquery-1.11.0.min.js', // Used if jQuery not already present.
JPLAYER_SCRIPT = '//www.jplayer.org/2.6.0/js/jquery.jplayer.min.js', // Used if jPlayer not already present.
JPLAYER_SWFPATH = '//www.jplayer.org/2.6.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.
Expand Down

0 comments on commit c93ae27

Please sign in to comment.