Skip to content

Commit

Permalink
Updated versioning to 2.8.2 and build new dist.
Browse files Browse the repository at this point in the history
  • Loading branch information
thepag committed Nov 20, 2014
1 parent c4b2714 commit 56d9c99
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 37 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jPlayer",
"version": "2.8.1",
"version": "2.8.2",
"description": "The jQuery HTML5 Audio / Video Library. Allows you to create a media player with a consistent interface and experience across all browsers.",
"author": {
"name": "Mark J Panaghiston",
Expand Down
16 changes: 11 additions & 5 deletions dist/add-on/jplayer.playlist.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
* http://www.opensource.org/licenses/MIT
*
* Author: Mark J Panaghiston
* Version: 2.4.0
* Date: 1st September 2014
* Version: 2.4.1
* Date: 19th November 2014
*
* Requires:
* - jQuery 1.7.0+
* - jPlayer 2.7.0+
* - jPlayer 2.8.2+
*/

/*global jPlayerPlaylist:true */
Expand All @@ -31,16 +31,22 @@
this.options = $.extend(true, {
keyBindings: {
next: {
key: 39, // RIGHT
key: 221, // ]
fn: function() {
self.next();
}
},
previous: {
key: 37, // LEFT
key: 219, // [
fn: function() {
self.previous();
}
},
shuffle: {
key: 83, // s
fn: function() {
self.shuffle();
}
}
},
stateClass: {
Expand Down
4 changes: 2 additions & 2 deletions dist/add-on/jplayer.playlist.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/add-on/jquery.jplayer.inspector.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 25 additions & 24 deletions dist/jplayer/jquery.jplayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* http://opensource.org/licenses/MIT
*
* Author: Mark J Panaghiston
* Version: 2.8.1
* Date: 13th November 2014
* Version: 2.8.2
* Date: 19th November 2014
*/

/* Support for Zepto 1.0 compiled with optional data module.
Expand Down Expand Up @@ -423,38 +423,33 @@
// The current jPlayer instance in focus.
$.jPlayer.focus = null;

// (fallback) The list of element node names to ignore with key controls.
// The list of element node names to ignore with key controls.
$.jPlayer.keyIgnoreElementNames = "A INPUT TEXTAREA SELECT BUTTON";

// The function that deals with key presses.
var keyBindings = function(event) {

var f = $.jPlayer.focus,
pageFocus = document.activeElement,
ignoreKey;

// A jPlayer instance must be in focus. ie., keyEnabled and the last one played.
if(f) {
// What generated the key press?
if(typeof pageFocus !== 'undefined') {
if(pageFocus !== null && pageFocus.nodeName.toUpperCase() !== "BODY") {
$.each( $.jPlayer.keyIgnoreElementNames.split(/\s+/g), function(i, name) {
// The strings should already be uppercase.
if(event.target.nodeName.toUpperCase() === name.toUpperCase()) {
ignoreKey = true;
return false; // exit each.
}
} else {
// Fallback for no document.activeElement support.
$.each( $.jPlayer.keyIgnoreElementNames.split(/\s+/g), function(i, name) {
// The strings should already be uppercase.
if(event.target.nodeName.toUpperCase() === name.toUpperCase()) {
ignoreKey = true;
return false; // exit each.
}
});
}
});
if(!ignoreKey) {
// See if the key pressed matches any of the bindings.
$.each(f.options.keyBindings, function(action, binding) {
// The binding could be a null when the default has been disabled. ie., 1st clause in if()
if(binding && event.which === binding.key && $.isFunction(binding.fn)) {
if(
(binding && $.isFunction(binding.fn)) &&
((typeof binding.key === 'number' && event.which === binding.key) ||
(typeof binding.key === 'string' && event.key === binding.key))
) {
event.preventDefault(); // Key being used by jPlayer, so prevent default operation.
binding.fn(f);
return false; // exit each.
Expand All @@ -479,7 +474,7 @@
$.jPlayer.prototype = {
count: 0, // Static Variable: Change it via prototype.
version: { // Static Object
script: "2.8.1",
script: "2.8.2",
needFlash: "2.8.0",
flash: "unknown"
},
Expand Down Expand Up @@ -592,7 +587,7 @@
// The parameter, f = $.jPlayer.focus, will be checked truethy before attempting to call any of these functions.
// Properties may be added to this object, in key/fn pairs, to enable other key controls. EG, for the playlist add-on.
play: {
key: 32, // space
key: 80, // p
fn: function(f) {
if(f.status.paused) {
f.play();
Expand All @@ -602,30 +597,36 @@
}
},
fullScreen: {
key: 13, // enter
key: 70, // f
fn: function(f) {
if(f.status.video || f.options.audioFullScreen) {
f._setOption("fullScreen", !f.options.fullScreen);
}
}
},
muted: {
key: 8, // backspace
key: 77, // m
fn: function(f) {
f._muted(!f.options.muted);
}
},
volumeUp: {
key: 38, // UP
key: 190, // .
fn: function(f) {
f.volume(f.options.volume + 0.1);
}
},
volumeDown: {
key: 40, // DOWN
key: 188, // ,
fn: function(f) {
f.volume(f.options.volume - 0.1);
}
},
loop: {
key: 76, // l
fn: function(f) {
f._loop(!f.options.loop);
}
}
},
verticalVolume: false, // Calculate volume from the bottom of the volume bar. Default is from the left. Also volume affects either width or height.
Expand Down
4 changes: 2 additions & 2 deletions dist/jplayer/jquery.jplayer.min.js

Large diffs are not rendered by default.

0 comments on commit 56d9c99

Please sign in to comment.