Skip to content

Commit 9ade273

Browse files
committed
Merge pull request #5 from esp/removeModelUpdates
0.0.14
2 parents c984c74 + b14f905 commit 9ade273

7 files changed

Lines changed: 61 additions & 9 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "esp-js-devtools",
3-
"version": "0.0.13",
3+
"version": "0.0.14",
44
"description": "Evented State Processor (ESP) dev tools",
55
"main": "dist/esp-js-devtools.js",
66
"scripts": {
@@ -13,7 +13,7 @@
1313
"repository": "https://github.com/esp/esp-js",
1414
"dependencies": {
1515
"babel-plugin-transform-runtime": "^6.4.3",
16-
"esp-js": "^0.5.15",
16+
"esp-js": "^0.5.16",
1717
"install": "^0.4.2",
1818
"jquery": "^2.2.0",
1919
"jquery-ui": "^1.10.5",

qq

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --git a/src/devtoolsHooks.js b/src/devtoolsHooks.js
2+
index 5543b0f..773aaaf 100644
3+
--- a/src/devtoolsHooks.js
4+
+++ b/src/devtoolsHooks.js
5+
@@ -53,13 +53,18 @@ class Controller {
6+
}
7+
tryOpenDevTools() {
8+
if(this._view === null) {
9+
- this._view = new DevToolsView(DevToolsModel.modelId, this._router);
10+
- this._view.start();
11+
- this._view.addDisposable(
12+
- () => {
13+
- this._view = null;
14+
- }
15+
- );
16+
+ try {
17+
+ this._view = new DevToolsView(DevToolsModel.modelId, this._router);
18+
+ this._view.start();
19+
+ this._view.addDisposable(
20+
+ () => {
21+
+ this._view = null;
22+
+ }
23+
+ );
24+
+ } catch (err) {
25+
+ alert(`Error opening dev tools ${err}`);
26+
+ }
27+
+
28+
}
29+
}
30+
}

src/devtoolsHooks.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,18 @@ class Controller {
5353
}
5454
tryOpenDevTools() {
5555
if(this._view === null) {
56-
this._view = new DevToolsView(DevToolsModel.modelId, this._router);
57-
this._view.start();
58-
this._view.addDisposable(
59-
() => {
60-
this._view = null;
61-
}
62-
);
56+
try {
57+
this._view = new DevToolsView(DevToolsModel.modelId, this._router);
58+
this._view.start();
59+
this._view.addDisposable(
60+
() => {
61+
this._view = null;
62+
}
63+
);
64+
} catch (err) {
65+
alert(`Error opening dev tools ${err}`);
66+
}
67+
6368
}
6469
}
6570
}

src/model/analyticsMonitor.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ export default class AnalyticsMonitor {
2727
if(modelId === DebugToolsModel.modelId) return;
2828
this._router.publishEvent(this._devToolsModelId, 'modelAdded', {modelId: modelId});
2929
}
30+
removeModel(modelId) {
31+
if(modelId === DebugToolsModel.modelId) return;
32+
this._router.publishEvent(this._devToolsModelId, 'modelRemoved', {modelId: modelId});
33+
}
3034
publishEvent(modelId, eventType, event) {
3135
if(modelId === DebugToolsModel.modelId) return;
3236
this._router.publishEvent(this._devToolsModelId,'eventPublished', {modelId: modelId, eventType: eventType, event:event});

src/model/devToolsModel.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ export default class DevToolsModel extends esp.model.DisposableBase {
6767
get shouldAutoScroll() {
6868
return this._shouldAutoScroll;
6969
}
70+
get shouldLogToConsole() {
71+
return this._shouldLogToConsole;
72+
}
7073
get dataPointsIdsToRemove() {
7174
return this._dataPointsIdsToRemove;
7275
}

src/views/devToolsView.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ export default class DevToolsView extends esp.model.DisposableBase {
9999
if (this._autoscrollCheckbox.prop('checked') !== model.shouldAutoScroll) {
100100
this._autoscrollCheckbox.prop('checked', model.shouldAutoScroll);
101101
}
102+
if (this._logEventsConsoleCheckbox.prop('checked') !== model.shouldLogToConsole) {
103+
this._logEventsConsoleCheckbox.prop('checked', model.shouldLogToConsole);
104+
}
102105
if (this._eventDetailsDescriptionP && model.selectedDataPoint) {
103106
this._eventDetailsDescriptionP.html(JSON.stringify(model.selectedDataPoint));
104107
}

src/views/devToolsView.less

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ div#esp-js-devtool-container {
1515
color: #5F5F5F;
1616
}
1717

18+
// hide vertical lines and corrosponding dots on the timeline.
19+
// we could use a 'type' of 'point', however that seems to be styled to allow a label which we don't use
20+
.vis-line, .vis-dot {
21+
display: none;
22+
}
23+
24+
1825
a:link, a:hover, a:visited, a:active {
1926
text-decoration: none;
2027
font-size: 16px;

0 commit comments

Comments
 (0)