From 3da0de46264895c946db1b0955618e6dc230cfd3 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <s.t.g.with@gmail.com>
Date: Sun, 22 Mar 2015 11:17:58 +0100
Subject: [PATCH] Fix bubble system

---
 js/h5p-event-dispatcher.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/js/h5p-event-dispatcher.js b/js/h5p-event-dispatcher.js
index e164564..31043f9 100644
--- a/js/h5p-event-dispatcher.js
+++ b/js/h5p-event-dispatcher.js
@@ -5,10 +5,16 @@ var H5P = H5P || {};
  * The Event class for the EventDispatcher
  * @class
  */
-H5P.Event = function(type, data) {
+H5P.Event = function(type, data, extras) {
   this.type = type;
   this.data = data;
   var bubbles = true;
+  if (extras === undefined) {
+    extras = {};
+  }
+  if (extras.bubbles === false) {
+    bubbles = false;
+  }
   this.preventBubbling = function() {
     bubbles = false;
   };
@@ -139,7 +145,6 @@ H5P.EventDispatcher = (function () {
      *  argument
      */
     this.trigger = function (event, eventData) {
-      console.log(event);
       if (event === undefined) {
         return;
       }
@@ -156,7 +161,7 @@ H5P.EventDispatcher = (function () {
       for (var i = 0; i < triggers[event.type].length; i++) {
         triggers[event.type][i].listener.call(triggers[event.type][i].thisArg, event);
       }
-      if (event.getBubbles() && typeof self.parent === 'function' && typeof self.parent.trigger === 'function') {
+      if (event.getBubbles() && self.parent instanceof H5P.EventDispatcher && typeof self.parent.trigger === 'function') {
         self.parent.trigger(event);
       } 
     };