From 019ee64e17b41dac4b61ddf10de18eb835af6aac Mon Sep 17 00:00:00 2001
From: Thomas Horn Sivertsen <thomass@cerpus.com>
Date: Tue, 22 May 2018 11:11:05 +0200
Subject: [PATCH] Use H5P.EventDispatcher to trigger and handle events

---
 js/h5p-content-upgrade.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/js/h5p-content-upgrade.js b/js/h5p-content-upgrade.js
index 0afe152..768c2da 100644
--- a/js/h5p-content-upgrade.js
+++ b/js/h5p-content-upgrade.js
@@ -1,6 +1,6 @@
 /*jshint -W083 */
 
-(function ($, Version) {
+(function ($, Version, EventDispatcher) {
   var info, $container, librariesCache = {}, scriptsCache = {};
 
   // Initialize
@@ -70,6 +70,15 @@
    * @returns {_L1.ContentUpgrade}
    */
   function ContentUpgrade(libraryId, events) {
+    if( typeof EventDispatcher !== 'undefined'){
+      EventDispatcher.call(this);
+      if( typeof events !== 'undefined'){
+          for (var i in events){
+              this.on(i, events[i]);
+          }
+      }
+    }
+
     var self = this;
 
     // Get selected version
@@ -85,8 +94,6 @@
     // Track number of working
     self.working = 0;
 
-    self.events = events || {};
-
     var start = function () {
       self.trigger('start');
 
@@ -448,15 +455,10 @@
 
   /**
    * Trigger
-   * @param action
-   * @param data
+   * Fallback function in case EventDispatcher is undefined
    */
-  ContentUpgrade.prototype.trigger = function (action, data) {
-    if( typeof this.events[action] !== "undefined"){
-      this.events[action].call(this, data);
-    }
-  };
+  ContentUpgrade.prototype.trigger = function () {};
 
   H5P.ContentUpgrade = ContentUpgrade;
 
-})(H5P.jQuery, H5P.Version);
+})(H5P.jQuery, H5P.Version, H5P.EventDispatcher);