added a new event and made the eventbus return the player instance

Author: moay

dist/afterglow.min.js

@@ -1,7 +1,7 @@
 {
   "name": "afterglowplayer",
   "description": "An easy to integrate HTML5 video player with lightbox support.",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "license": "MIT",
   "repository": {
     "type": "git",

dist/afterglow.zip

@@ -58,7 +58,7 @@ class Eventbus{
 			return false;
 		}
 		for (var i = 0; i < this.players[playerid].listeners[event].length; i++) {
-			this.players[playerid].listeners[event][i]({type: event, player: playerid});
+			this.players[playerid].listeners[event][i]({type: event, playerid: playerid, player: window.afterglow.getPlayer(playerid)});
 		}
 	}
 }

package.json

@@ -239,6 +239,7 @@ class Lightbox extends DOMElement{
 	 * @return void
 	 */
 	close(){
+		window.afterglow.eventbus.dispatch(this.player.id, 'before-lightbox-close');
 		this.player.destroy(true);
 		this.node.parentNode.removeChild(this.node);
 		this.emit('close');

src/js/afterglow/components/Eventbus.js

@@ -1,6 +1,7 @@
 import Player from '../src/js/afterglow/components/Player';
 import Lightbox from '../src/js/afterglow/components/Lightbox';
 import Emitter from '../vendor/Emitter/Emitter';
+import Eventbus from '../src/js/afterglow/components/Eventbus';
 import DOMElement from '../src/js/afterglow/lib/DOMElement';
 import Util from '../src/js/afterglow/lib/Util';
 
@@ -246,9 +247,15 @@ describe("Afterglow Lightbox", () => {
 
 	describe('close()', () => {
 		beforeEach(() => {
+
+			sinon.stub(Eventbus.prototype, 'dispatch');
 			sinon.stub(Lightbox.prototype, 'build');
 			sinon.stub(Lightbox.prototype, 'bindEmitter');
 			sinon.stub(DOMElement.prototype, 'addClass');
+
+			window.afterglow = {};
+			window.afterglow.eventbus = new Eventbus();
+
 			lightbox = new Lightbox();
 			lightbox.player = {
 				destroy : () => {}
@@ -269,6 +276,7 @@ describe("Afterglow Lightbox", () => {
 			Lightbox.prototype.bindEmitter.restore();
 			DOMElement.prototype.addClass.restore();
 			Lightbox.prototype.build.restore();
+			Eventbus.prototype.dispatch.restore();
 		});
 
 		it('should properly trigger the destroy method on the player', () => {
@@ -283,6 +291,7 @@ describe("Afterglow Lightbox", () => {
 
 		it('should emit the closing event', () => {
 			lightbox.close();
+			assert(Eventbus.prototype.dispatch.calledOnce);
 			expect(lightbox.emit).to.have.been.calledOnce;
 			expect(lightbox.emit).to.have.been.calledWith('close');
 		});

src/js/afterglow/components/Lightbox.js

@@ -3,6 +3,7 @@ import Eventbus from '../src/js/afterglow/components/Eventbus';
 var chai = require('chai');
 var sinon = require("sinon");
 var sinonChai = require("sinon-chai");
+var jsdom = require('mocha-jsdom');
 
 chai.use(sinonChai);
 chai.should();
@@ -41,7 +42,14 @@ describe("Eventbus", () => {
 
 
 	describe('dispatch()', () => {
+		// Initiate the DOM
+		jsdom();
+
 		it('should dispatch events',() => {
+			window.afterglow = {
+				getPlayer: sinon.spy()
+			}
+
 			eventbus.players = {
 				playerid : {
 					listeners : {
@@ -62,6 +70,23 @@ describe("Eventbus", () => {
 			eventbus.dispatch('playerid','event1');
 			sinon.assert.calledThrice(testCallback);
 		});
+
+		it('should pass the player instance', () => {
+			window.afterglow = {
+				getPlayer: sinon.stub().returns({id:42})
+			}
+
+			eventbus.players = {
+				playerid : {
+					listeners : {
+						'event1': [testCallback]
+					}
+				}
+			};
+			eventbus.dispatch('playerid','event1');
+			assert(window.afterglow.getPlayer.called);
+			assert(testCallback.calledWith({type:'event1', player: {id:42}, playerid: 'playerid'}));
+		});
 	});
 
 });