From 383afbc66de0eaa2a441bc1ee226a318556e1403 Mon Sep 17 00:00:00 2001
From: Robert Smallwood <robert.smallwood@readytalk.com>
Date: Mon, 14 Dec 2015 15:23:07 -0700
Subject: [PATCH] Fixes from PR, removing local event emitter

---
 modules/desktopsharing/ScreenObtainer.js | 7 +++----
 modules/settings/Settings.js             | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/desktopsharing/ScreenObtainer.js b/modules/desktopsharing/ScreenObtainer.js
index 7b9457c49..bb8e1afba 100644
--- a/modules/desktopsharing/ScreenObtainer.js
+++ b/modules/desktopsharing/ScreenObtainer.js
@@ -33,8 +33,6 @@ var firefoxExtInstalled = null;
  */
 var reDetectFirefoxExtension = false;
 
-var eventEmitter = new EventEmitter();
-
 /**
  * Handles obtaining a stream from a screen capture on different browsers.
  */
@@ -185,7 +183,8 @@ function isUpdateRequired(minVersion, extVersion) {
         return false;
     }
     catch (e) {
-        eventEmitter.emit(DesktopSharingEventTypes.EXTENSION_VERSION_ERROR);
+        this.eventEmitter
+          .emit(DesktopSharingEventTypes.EXTENSION_VERSION_ERROR);
         console.error("Failed to parse extension version", e);
         return true;
     }
@@ -282,7 +281,7 @@ function obtainScreenFromExtension(streamCallback, failCallback) {
                 }, 500);
             },
             function (arg) {
-                eventEmitter
+                this.eventEmitter
                   .emit(DesktopSharingEventTypes.EXTENSION_INSTALLATION_ERROR);
                 console.log("Failed to install the extension", arg);
                 failCallback(arg);
diff --git a/modules/settings/Settings.js b/modules/settings/Settings.js
index d1e819ca7..204dbbf34 100644
--- a/modules/settings/Settings.js
+++ b/modules/settings/Settings.js
@@ -95,7 +95,7 @@ var Settings = {
     setLanguage: function (lang) {
         language = lang;
         window.localStorage.language = lang;
-    },
+    }
 };
 
 module.exports = Settings;