Skip to content

Commit

Permalink
Bump to 2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nirvanatikku committed Dec 3, 2016
1 parent 8219ff1 commit d3974bc
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 11 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

__v2.1.0 - Dec 2, 2016__

* Exposed default settings `$.tubeplayer.defaults.settings`
* New player event: "onPlayerLoaded", _complementing_ $.tubeplayer.defaults.afterReady

__v2.0.0 - Dec 2, 2016__

* Removed code to handle flash player (due to deprecation); instead - uses iframe player exclusively
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jquery-tubeplayer-plugin",
"version": "2.0.0",
"version": "2.1.0",
"homepage": "https://github.com/nirvanatikku/jQuery-TubePlayer-Plugin",
"authors": [
"Nirvana Tikku <[email protected]>"
Expand Down
16 changes: 10 additions & 6 deletions dist/jquery.tubeplayer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! jQuery TubePlayer - Simplified YouTube Player Management - v2.0.0-beta - 2016-12-02
/*! jQuery TubePlayer - Simplified YouTube Player Management - v2.1.0 - 2016-12-02
* https://github.com/nirvanatikku/jQuery-TubePlayer-Plugin
* Copyright (c) 2016 Nirvana Tikku; Licensed MIT */
(function($) {
Expand Down Expand Up @@ -123,7 +123,8 @@
playing: {},
paused: {},
buffering: {},
cued: {}
cued: {},
loaded: {}
},
onErr: {
defaultError: {},
Expand All @@ -138,7 +139,7 @@
* plugin to work without providing any parameters. They
* are merged with the users options.
*/
var defaults = {
$.tubeplayer.defaults.settings = {

// public facing
width: 480,
Expand Down Expand Up @@ -169,6 +170,7 @@
onUnMute: function() {},

// functions called when events are triggered from the youtube player itself
onPlayerLoaded: function(){},
onPlayerUnstarted: function() {},
onPlayerEnded: function() {},
onPlayerPlaying: function() {},
Expand Down Expand Up @@ -225,7 +227,7 @@
'id' : ids ? ids : ''
});
$this.replaceWith(newDiv);
var new_input = $.extend({}, defaults, settings, input);
var new_input = $.extend({}, $.tubeplayer.defaults.settings, settings, input);
TP.init(newDiv, new_input);
}
} else {
Expand Down Expand Up @@ -280,7 +282,7 @@
if ($player.hasClass(TUBEPLAYER_CLASS)) {
return $player;
}
var o = $.extend({}, defaults, opts);
var o = $.extend({}, $.tubeplayer.defaults.settings, opts);
o.playerID += "-" + guid();
$player.addClass(TUBEPLAYER_CLASS).data(OPTS, o);
for (var event in PlayerEvents){
Expand Down Expand Up @@ -342,6 +344,7 @@
'onReady': function(evt) {
TP.ytplayers[o.playerID] = evt.target;
var $player = $(evt.target.getIframe()).parents("." + TUBEPLAYER_CLASS);
$player.tubeplayer('opts').onPlayerLoaded.call($player);
$.tubeplayer.defaults.afterReady($player);
},
'onPlaybackQualityChange': $.tubeplayer.defaults.qualityChange(o.playerID),
Expand Down Expand Up @@ -385,6 +388,7 @@
dp.paused[ID] = o.onPlayerPaused;
dp.buffering[ID] = o.onPlayerBuffering;
dp.cued[ID] = o.onPlayerCued;
dp.loaded[ID] = o.onPlayerLoaded;

// default onQualityChange
d.onQualityChange[ID] = o.onQualityChange;
Expand Down Expand Up @@ -592,7 +596,7 @@
delete TP.ytplayers[p.opts.playerID];
// cleanup callback handler references..
var d = $.tubeplayer.defaults;
var events = ['unstarted', 'ended', 'playing', 'paused', 'buffering', 'cued'];
var events = ['unstarted', 'ended', 'playing', 'paused', 'buffering', 'cued', 'loaded'];
$.each(events, function(i, event) {
delete d.onPlayer[event][p.opts.playerID];
});
Expand Down
Loading

0 comments on commit d3974bc

Please sign in to comment.