ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00
Code Issues Releases Wiki Activity

Small things that could only be fixed after merging

Browse Source
This commit is contained in:
Brett Sun 2016-02-08 11:03:41 +01:00
parent 537d6d52e8
commit 028058a12f
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/components/ascribe_uploader/react_s3_fine_uploader.js
View File

@ -15,6 +15,7 @@ import GlobalNotificationActions from '../../actions/global_notification_actions
import AppConstants from '../../constants/application_constants'; import AppConstants from '../../constants/application_constants';
import { ErrorClasses, testErrorAgainstAll } from '../../constants/error_constants'; import { ErrorClasses, testErrorAgainstAll } from '../../constants/error_constants';
import { RETRY_ATTEMPT_TO_SHOW_CONTACT_US } from '../../constants/uploader_constants';
import { displayValidFilesFilter, FileStatus, transformAllowedExtensionsToInputAcceptProp } from './react_s3_fine_uploader_utils'; import { displayValidFilesFilter, FileStatus, transformAllowedExtensionsToInputAcceptProp } from './react_s3_fine_uploader_utils';
import { getCookie } from '../../utils/fetch_api_utils'; import { getCookie } from '../../utils/fetch_api_utils';
@ -34,9 +35,6 @@ const { shape,
element, element,
arrayOf } = React.PropTypes; arrayOf } = React.PropTypes;
// After 5 manual retries, show the contact us prompt.
const RETRY_ATTEMPT_TO_SHOW_CONTACT_US = 5;
const ReactS3FineUploader = React.createClass({ const ReactS3FineUploader = React.createClass({
propTypes: { propTypes: {
areAssetsDownloadable: bool, areAssetsDownloadable: bool,

9
js/constants/error_constants.js
View File

@ -1,5 +1,7 @@
'use strict' 'use strict'
import { validationParts } from './uploader_constants';
import { deepMatchObject } from '../utils/general_utils'; import { deepMatchObject } from '../utils/general_utils';
import { getLangText } from '../utils/lang_utils'; import { getLangText } from '../utils/lang_utils';
@ -112,9 +114,10 @@ const ErrorClasses = {
// Fallback error tips // Fallback error tips
'largeFileSize': { 'largeFileSize': {
'prettifiedText': getLangText('We handle files up to 25GB but your Internet connection may not. With ' + 'prettifiedText': getLangText(`We handle files up to ${validationParts.sizeLimit.default / 1000000000}GB ` +
'large files and limited bandwith, it may take some time to complete. If ' + 'but your Internet connection may not. With large files and limited ' +
'it doesn’t seem to progress at all, try restarting the process.') 'bandwith, it may take some time to complete. If it doesn’t seem to ' +
'progress at all, try restarting the process.')
}, },
'tryDifferentBrowser': { 'tryDifferentBrowser': {
'prettifiedText': getLangText("We're still having trouble uploading your file. It might be your " + 'prettifiedText': getLangText("We're still having trouble uploading your file. It might be your " +

3
js/constants/uploader_constants.js
View File

@ -30,3 +30,6 @@ export const validationTypes = {
sizeLimit: sizeLimit.thumbnail sizeLimit: sizeLimit.thumbnail
} }
}; };
// Number of manual retries before showing a contact us screen on the uploader.
export const RETRY_ATTEMPT_TO_SHOW_CONTACT_US = 5;