diff --git a/src/lib/viewers/doc/DocBaseViewer.js b/src/lib/viewers/doc/DocBaseViewer.js index bd548adcb..7e1f2fc07 100644 --- a/src/lib/viewers/doc/DocBaseViewer.js +++ b/src/lib/viewers/doc/DocBaseViewer.js @@ -660,7 +660,7 @@ class DocBaseViewer extends BaseViewer { // Disable range requests for files smaller than MINIMUM_RANGE_REQUEST_FILE_SIZE (25MB) for // previews outside of the US since the additional latency overhead per range request can be // more than the additional time for a continuous request. - const isRangeSupported = location.locale !== 'en-US' && size > RANGE_REQUEST_MINIMUM_SIZE; + const isRangeSupported = location.locale === 'en-US' || size >= RANGE_REQUEST_MINIMUM_SIZE; const isWatermarked = watermarkInfo && watermarkInfo.is_watermarked; const disableRange = isWatermarked || !isRangeSupported; diff --git a/src/lib/viewers/doc/__tests__/DocBaseViewer-test.js b/src/lib/viewers/doc/__tests__/DocBaseViewer-test.js index 707ce53ca..221afbd00 100644 --- a/src/lib/viewers/doc/__tests__/DocBaseViewer-test.js +++ b/src/lib/viewers/doc/__tests__/DocBaseViewer-test.js @@ -1174,11 +1174,11 @@ describe('src/lib/viewers/doc/DocBaseViewer', () => { }); }); - it('should disable range requests if the locale is en-US', () => { + it('should not disable range requests if the locale is en-US', () => { docBase.options.location.locale = 'en-US'; return docBase.initViewer('').then(() => { - expect(stubs.getDocument).to.be.calledWith(sinon.match({ disableRange: true })); + expect(stubs.getDocument).to.be.calledWith(sinon.match({ disableRange: false })); }); }); @@ -1271,12 +1271,16 @@ describe('src/lib/viewers/doc/DocBaseViewer', () => { }); it('should append encoding query parameter for gzip content when range requests are disabled', () => { - const defaultChunkSize = 1048576; // Taken from RANGE_REQUEST_CHUNK_SIZE_US + const defaultChunkSize = 524288; // Taken from RANGE_CHUNK_SIZE_NON_US const url = 'www.myTestPDF.com/123456'; const paramsList = `${QUERY_PARAM_ENCODING}=${ENCODING_TYPES.GZIP}`; docBase.options.location = { - locale: 'en-US', // Disables range requests + locale: 'ja-JP', // Disables range requests + }; + + docBase.options.file = { + size: 1048576, // 1MB < RANGE_REQUEST_MINIMUM_SIZE (25MB) }; return docBase.initViewer(url).then(() => {