Merge pull request #68 from esp/devToolsUpdate

0.5.16
esp · Feb 20, 2016 · eb21221 · eb21221
2 parents 543b3ad + 5f03767
commit eb21221
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esp-js",
-  "version": "0.5.15",
+  "version": "0.5.16",
   "description": "Evented State Processor (ESP) adds specific processing workflow around changes to a model's state",
   "keywords": [
     "state processor",

diff --git a/src/router/Router.js b/src/router/Router.js
@@ -53,6 +53,7 @@ export default class Router extends DisposableBase {
         Guard.isString(modelId, 'The modelId argument should be a string');
         let modelRecord = this._models[modelId];
         if(modelRecord){
+            this._diagnosticMonitor.removeModel(modelId);
             modelRecord.wasRemoved = true;
             delete this._models[modelId];
             modelRecord.eventQueue.length = 0;

diff --git a/src/router/devtools/compositeDiagnosticMonitor.js b/src/router/devtools/compositeDiagnosticMonitor.js
@@ -40,6 +40,10 @@ export default class CompositeDiagnosticMonitor extends DisposableBase {
         this._currentLoggingDiagnosticMonitor.addModel(modelId);
         this._devToolsDiagnostic.addModel(modelId);
     }
+    removeModel(modelId){
+        this._currentLoggingDiagnosticMonitor.removeModel(modelId);
+        this._devToolsDiagnostic.removeModel(modelId);
+    }
     publishEvent(modelId, eventType, event) {
         this._currentLoggingDiagnosticMonitor.publishEvent(modelId, eventType);
         this._devToolsDiagnostic.publishEvent(modelId, eventType, event);

diff --git a/src/router/devtools/devToolsDiagnosticMonitor.js b/src/router/devtools/devToolsDiagnosticMonitor.js
@@ -35,6 +35,11 @@ export default class DevToolsDiagnosticMonitor extends DisposableBase {
             window.__espAnalyticsMonitor.addModel(modelId);
         }
     }
+    removeModel(modelId){
+        if(this._ensureDiagnosticEnabled()) {
+            window.__espAnalyticsMonitor.removeModel(modelId);
+        }
+    }
     publishEvent(modelId, eventType, event) {
         if(this._ensureDiagnosticEnabled()) {
             window.__espAnalyticsMonitor.publishEvent(modelId, eventType, event);

diff --git a/src/router/devtools/loggingDiagnosticMonitor.js b/src/router/devtools/loggingDiagnosticMonitor.js
@@ -35,6 +35,8 @@ export default class LoggingDiagnosticMonitor {
     }
     addModel(modelId){
     }
+    removeModel(modelId){
+    }
     publishEvent(modelId, eventType) {
         this._pushStep(`[PublishEvent]:${modelId}:${eventType}`);
     }

diff --git a/src/router/devtools/noopDiagnosticMonitor.js b/src/router/devtools/noopDiagnosticMonitor.js
@@ -19,6 +19,8 @@
 export default class NoopDiagnosticMonitor {
     addModel(){
     }
+    removeModel(){
+    }
     getSummary() {
         return 'Call router.enableDiagnostics() to enable diagnostics. If in a browser use esp-js-devtools.';
     }