summaryrefslogtreecommitdiffstats
path: root/devtools/client/netmonitor/netmonitor-controller.js
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-03-03 19:42:25 +0100
committerGitHub <noreply@github.com>2018-03-03 19:42:25 +0100
commitd252c5b2320859c58900b68a7f5ac82199aa1e83 (patch)
treebee56152ced9b7485267debb8d50fca952d9c447 /devtools/client/netmonitor/netmonitor-controller.js
parentc3039dadd95f5487e84311a9719604fa901aacd7 (diff)
parent8114b67b64e17482e46c2eaa77dd6a6156130dba (diff)
downloadUXP-d252c5b2320859c58900b68a7f5ac82199aa1e83.tar
UXP-d252c5b2320859c58900b68a7f5ac82199aa1e83.tar.gz
UXP-d252c5b2320859c58900b68a7f5ac82199aa1e83.tar.lz
UXP-d252c5b2320859c58900b68a7f5ac82199aa1e83.tar.xz
UXP-d252c5b2320859c58900b68a7f5ac82199aa1e83.zip
Merge pull request #36 from janekptacijarabaci/devtools_import-from-moebius_2
Port across devtools enhancements - 2
Diffstat (limited to 'devtools/client/netmonitor/netmonitor-controller.js')
-rw-r--r--devtools/client/netmonitor/netmonitor-controller.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/devtools/client/netmonitor/netmonitor-controller.js b/devtools/client/netmonitor/netmonitor-controller.js
index 739e174fb..939b6e4f5 100644
--- a/devtools/client/netmonitor/netmonitor-controller.js
+++ b/devtools/client/netmonitor/netmonitor-controller.js
@@ -414,6 +414,7 @@ TargetEventsHandler.prototype = {
}
// Clear any accumulated markers.
NetMonitorController.NetworkEventsHandler.clearMarkers();
+ gStore.dispatch(Actions.clearTimingMarkers());
window.emit(EVENTS.TARGET_WILL_NAVIGATE);
break;
@@ -534,6 +535,7 @@ NetworkEventsHandler.prototype = {
_onDocLoadingMarker: function (marker) {
window.emit(EVENTS.TIMELINE_EVENT, marker);
this._markers.push(marker);
+ gStore.dispatch(Actions.addTimingMarker(marker));
},
/**