Updated popcorn plugin with new cdn urls

thepag · thepag · commit ef5b584946a0 · 2014-11-27T17:51:06.000Z
diff --git a/dist/popcorn/popcorn.jplayer.js b/dist/popcorn/popcorn.jplayer.js
@@ -7,27 +7,27 @@
  * http://opensource.org/licenses/MIT
  *
  * Author: Mark J Panaghiston
- * Version: 1.1.5
- * Date: 11th November 2014
+ * Version: 1.1.6
+ * Date: 27th November 2014
  *
  * For Popcorn Version: 1.3
- * For jPlayer Version: 2.8.0
+ * For jPlayer Version: 2.9.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.
  */
 
 (function(Popcorn) {
 
 	var JQUERY_SCRIPT = '//code.jquery.com/jquery-1.11.1.min.js', // Used if jQuery not already present.
-	JPLAYER_SCRIPT = '//code.jplayer.org/2.8.0/jquery.jplayer.min.js', // Used if jPlayer not already present.
-	JPLAYER_SWFPATH = '//code.jplayer.org/2.8.0/jquery.jplayer.swf', // Used if not specified in jPlayer options via SRC Object.
+	JPLAYER_SCRIPT = '//code.jplayer.org/2.9.0/jplayer/jquery.jplayer.min.js', // Used if jPlayer not already present.
+	JPLAYER_SWFPATH = '//code.jplayer.org/2.9.0/jplayer/jquery.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.5.0 object, to avoid always requiring jQuery and jPlayer to be loaded before performing the _canPlayType() test.
 		mp3: {
-			codec: 'audio/mpeg;',
+			codec: 'audio/mpeg',
 			flashCanPlay: true,
 			media: 'audio'
 		},
diff --git a/dist/popcorn/popcorn.jplayer.min.js b/dist/popcorn/popcorn.jplayer.min.js
diff --git a/src/javascript/popcorn/popcorn.jplayer.js b/src/javascript/popcorn/popcorn.jplayer.js
@@ -7,27 +7,27 @@
  * http://opensource.org/licenses/MIT
  *
  * Author: Mark J Panaghiston
- * Version: 1.1.5
- * Date: 11th November 2014
+ * Version: 1.1.6
+ * Date: 27th November 2014
  *
  * For Popcorn Version: 1.3
- * For jPlayer Version: 2.8.0
+ * For jPlayer Version: 2.9.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.
  */
 
 (function(Popcorn) {
 
 	var JQUERY_SCRIPT = '//code.jquery.com/jquery-1.11.1.min.js', // Used if jQuery not already present.
-	JPLAYER_SCRIPT = '//code.jplayer.org/2.8.0/jquery.jplayer.min.js', // Used if jPlayer not already present.
-	JPLAYER_SWFPATH = '//code.jplayer.org/2.8.0/jquery.jplayer.swf', // Used if not specified in jPlayer options via SRC Object.
+	JPLAYER_SCRIPT = '//code.jplayer.org/2.9.0/jplayer/jquery.jplayer.min.js', // Used if jPlayer not already present.
+	JPLAYER_SWFPATH = '//code.jplayer.org/2.9.0/jplayer/jquery.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.5.0 object, to avoid always requiring jQuery and jPlayer to be loaded before performing the _canPlayType() test.
 		mp3: {
-			codec: 'audio/mpeg;',
+			codec: 'audio/mpeg',
 			flashCanPlay: true,
 			media: 'audio'
 		},
