diff options
author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-02-28 16:02:31 +0100 |
---|---|---|
committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-02-28 16:02:31 +0100 |
commit | abf60058584772437a317fbc27ea32cbda4a07cb (patch) | |
tree | 9cd95e40a1daf21868890190ee4955da24cf98b3 /devtools/client/netmonitor/components | |
parent | 9fafdd4546bb51ff2a29a67f369797d19d614350 (diff) | |
download | UXP-abf60058584772437a317fbc27ea32cbda4a07cb.tar UXP-abf60058584772437a317fbc27ea32cbda4a07cb.tar.gz UXP-abf60058584772437a317fbc27ea32cbda4a07cb.tar.lz UXP-abf60058584772437a317fbc27ea32cbda4a07cb.tar.xz UXP-abf60058584772437a317fbc27ea32cbda4a07cb.zip |
Bug 1168376: Show transferred size in request summary instead of decompressed size
https://github.com/MoonchildProductions/moebius/pull/93
- without: DOMContentLoaded and load
Diffstat (limited to 'devtools/client/netmonitor/components')
-rw-r--r-- | devtools/client/netmonitor/components/summary-button.js | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/devtools/client/netmonitor/components/summary-button.js b/devtools/client/netmonitor/components/summary-button.js index 9465d3147..223552fbf 100644 --- a/devtools/client/netmonitor/components/summary-button.js +++ b/devtools/client/netmonitor/components/summary-button.js @@ -14,21 +14,25 @@ const { DOM, PropTypes } = require("devtools/client/shared/vendor/react"); const { connect } = require("devtools/client/shared/vendor/react-redux"); const { PluralForm } = require("devtools/shared/plural-form"); const { L10N } = require("../l10n"); -const { getSummary } = require("../selectors/index"); +const { + getDisplayedRequestsSummary +} = require("../selectors/index"); const { button, span } = DOM; function SummaryButton({ summary, - triggerSummary, + triggerSummary }) { - let { count, totalBytes, totalMillis } = summary; + let { count, contentSize, transferredSize, millis } = summary; const text = (count === 0) ? L10N.getStr("networkMenu.empty") : - PluralForm.get(count, L10N.getStr("networkMenu.summary")) + PluralForm.get(count, L10N.getStr("networkMenu.summary2")) .replace("#1", count) - .replace("#2", L10N.numberWithDecimals(totalBytes / 1024, + .replace("#2", L10N.numberWithDecimals(contentSize / 1024, CONTENT_SIZE_DECIMALS)) - .replace("#3", L10N.numberWithDecimals(totalMillis / 1000, + .replace("#3", L10N.numberWithDecimals(transferredSize / 1024, + CONTENT_SIZE_DECIMALS)) + .replace("#4", L10N.numberWithDecimals(millis / 1000, REQUEST_TIME_DECIMALS)); return button({ @@ -47,7 +51,7 @@ SummaryButton.propTypes = { module.exports = connect( (state) => ({ - summary: getSummary(state), + summary: getDisplayedRequestsSummary(state), }), (dispatch) => ({ triggerSummary: () => { |