Component and other handler deregisterations

app/assets/javascripts/services/desktopManager.js

@@ -1,8 +1,7 @@
 /* eslint-disable camelcase */
 // An interface used by the Desktop app to interact with SN
-import pull from 'lodash/pull';
 import { isDesktopApplication } from '@/utils';
-import { EncryptionIntents, ApplicationService, ApplicationEvents } from 'snjs';
+import { EncryptionIntents, ApplicationService, ApplicationEvents, removeFromArray } from 'snjs';
 
 const COMPONENT_DATA_KEY_INSTALL_ERROR = 'installError';
 const COMPONENT_CONTENT_KEY_PACKAGE_INFO = 'package_info';
@@ -89,7 +88,9 @@ export class DesktopManager extends ApplicationService {
       callback: callback
     };
     this.updateObservers.push(observer);
-    return observer;
+    return () => {
+      removeFromArray(this.updateObservers, observer);
+    };
   }
 
   searchText(text) {
@@ -106,10 +107,6 @@ export class DesktopManager extends ApplicationService {
     }
   }
 
-  deregisterUpdateObserver(observer) {
-    pull(this.updateObservers, observer);
-  }
-
   // Pass null to cancel search
   desktop_setSearchHandler(handler) {
     this.searchHandler = handler;
@@ -161,7 +158,7 @@ export class DesktopManager extends ApplicationService {
   }
 
   desktop_deregisterComponentActivationObserver(observer) {
-    pull(this.componentActivationObservers, observer);
+    removeFromArray(this.componentActivationObservers, observer);
   }
 
   /* Notify observers that a component has been registered/activated */