Merge branch 'master' into dev

grantg182 · Apr 1, 2014 · 1906561 · 1906561
2 parents 3c74f75 + 49dc5c4
commit 1906561
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "jPlayer",
-	"version": "2.5.5",
+	"version": "2.5.6",
 	"main": [
 		"./jquery.jplayer/jquery.jplayer.js",
 		"./skin/pink.flag/jplayer.pink.flag.css"

diff --git a/jplayer.jquery.json b/jplayer.jquery.json
@@ -11,7 +11,7 @@
 		"html5",
 		"streaming"
 	],
-	"version": "2.5.5",
+	"version": "2.5.6",
 	"author": {
 		"name": "Mark J Panaghiston",
 		"email": "[email protected]",

diff --git a/jquery.jplayer/jquery.jplayer.js b/jquery.jplayer/jquery.jplayer.js
@@ -7,8 +7,8 @@
  * http://opensource.org/licenses/MIT
  *
  * Author: Mark J Panaghiston
- * Version: 2.5.5
- * Date: 8th March 2014
+ * Version: 2.5.6
+ * Date: 1st April 2014
  */
 
 /* Code verified using http://www.jshint.com/ */
@@ -471,7 +471,7 @@
 	$.jPlayer.prototype = {
 		count: 0, // Static Variable: Change it via prototype.
 		version: { // Static Object
-			script: "2.5.5",
+			script: "2.5.6",
 			needFlash: "2.5.2",
 			flash: "unknown"
 		},
@@ -2558,7 +2558,7 @@
 		_fullscreenRemoveEventListeners: function() {
 			var fs = $.jPlayer.nativeFeatures.fullscreen;
 			if(this.internal.fullscreenchangeHandler) {
-				document.addEventListener(fs.event.fullscreenchange, this.internal.fullscreenchangeHandler, false);
+				document.removeEventListener(fs.event.fullscreenchange, this.internal.fullscreenchangeHandler, false);
 			}
 		},
 		_fullscreenchange: function() {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jplayer",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "The jQuery HTML5 Audio / Video Library",
   "homepage": "http://www.jplayer.org/",
   "keywords": [