mirror of
https://github.com/ascribe/onion.git
synced 2024-11-15 01:25:17 +01:00
first cut pause
This commit is contained in:
parent
8064fdb39d
commit
e44ae60b75
@ -14,11 +14,11 @@ let FileDragAndDropPreviewImage = React.createClass({
|
|||||||
|
|
||||||
getInitialState() {
|
getInitialState() {
|
||||||
return {
|
return {
|
||||||
loading: false
|
paused: false
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
onClick(e) {
|
/*onClick(e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|
||||||
@ -27,6 +27,15 @@ let FileDragAndDropPreviewImage = React.createClass({
|
|||||||
});
|
});
|
||||||
|
|
||||||
this.props.onClick(e);
|
this.props.onClick(e);
|
||||||
|
},*/
|
||||||
|
|
||||||
|
toggleUploadProcess(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
|
||||||
|
this.setState({
|
||||||
|
paused: true
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
@ -35,13 +44,14 @@ let FileDragAndDropPreviewImage = React.createClass({
|
|||||||
backgroundSize: 'cover'
|
backgroundSize: 'cover'
|
||||||
};
|
};
|
||||||
|
|
||||||
let actionSymbol = this.state.loading ? <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} /> : <span className="glyphicon glyphicon-remove delete-file" aria-hidden="true" title="Delete or cancel upload" onClick={this.onClick} />;
|
//let actionSymbol = this.state.loading ? <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} /> : <span className="glyphicon glyphicon-remove delete-file" aria-hidden="true" title="Delete or cancel upload" onClick={this.onClick} />;
|
||||||
|
let actionSymbol = this.state.paused ? <span className="glyphicon glyphicon-pause action-file" aria-hidden="true" title="Pause upload" onClick={this.toggleUploadProcess}/> : <span className="glyphicon glyphicon-play action-file" aria-hidden="true" title="Pause upload" onClick={this.toggleUploadProcess}/>
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className="file-drag-and-drop-preview-image"
|
className="file-drag-and-drop-preview-image"
|
||||||
style={imageStyle}>
|
style={imageStyle}>
|
||||||
<ProgressBar completed={this.props.progress} color="black"/>
|
<ProgressBar completed={this.props.progress} color="black"/>
|
||||||
{actionSymbol}
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -30,14 +30,14 @@ let FileDragAndDropPreviewOther = React.createClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
let actionSymbol = this.state.loading ? <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} /> : <span className="glyphicon glyphicon-remove delete-file" aria-hidden="true" title="Delete or cancel upload" onClick={this.onClick} />;
|
//let actionSymbol = this.state.loading ? <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} /> : <span className="glyphicon glyphicon-remove delete-file" aria-hidden="true" title="Delete or cancel upload" onClick={this.onClick} />;
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className="file-drag-and-drop-preview">
|
className="file-drag-and-drop-preview">
|
||||||
<ProgressBar completed={this.props.progress} color="black"/>
|
<ProgressBar completed={this.props.progress} color="black"/>
|
||||||
<div className="file-drag-and-drop-preview-table-wrapper">
|
<div className="file-drag-and-drop-preview-table-wrapper">
|
||||||
<div className="file-drag-and-drop-preview-other">
|
<div className="file-drag-and-drop-preview-other">
|
||||||
{actionSymbol}
|
<span className="glyphicon glyphicon-pause delete-file" aria-hidden="true" title="Delete or cancel upload"/>
|
||||||
<span>{'.' + this.props.type}</span>
|
<span>{'.' + this.props.type}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
import React from 'react';
|
|
||||||
|
|
||||||
let FileDragAndDropToolbar = React.createClass({
|
|
||||||
render() {
|
|
||||||
return (
|
|
||||||
<div></div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
export default FileDragAndDropToolbar;
|
|
@ -12,7 +12,6 @@ import { getCookie } from '../../utils/fetch_api_utils';
|
|||||||
|
|
||||||
import fineUploader from 'fineUploader';
|
import fineUploader from 'fineUploader';
|
||||||
import FileDragAndDrop from './file_drag_and_drop';
|
import FileDragAndDrop from './file_drag_and_drop';
|
||||||
import FileDragAndDropToolbar from './file_drag_and_drop_toolbar';
|
|
||||||
|
|
||||||
import GlobalNotificationModel from '../../models/global_notification_model';
|
import GlobalNotificationModel from '../../models/global_notification_model';
|
||||||
import GlobalNotificationActions from '../../actions/global_notification_actions';
|
import GlobalNotificationActions from '../../actions/global_notification_actions';
|
||||||
@ -179,7 +178,6 @@ var ReactS3FineUploader = React.createClass({
|
|||||||
onComplete: this.onComplete,
|
onComplete: this.onComplete,
|
||||||
onCancel: this.onCancel,
|
onCancel: this.onCancel,
|
||||||
onDelete: this.onDelete,
|
onDelete: this.onDelete,
|
||||||
onSessionRequestComplete: this.onSessionRequestComplete,
|
|
||||||
onProgress: this.onProgress,
|
onProgress: this.onProgress,
|
||||||
onRetry: this.onRetry,
|
onRetry: this.onRetry,
|
||||||
onAutoRetry: this.onAutoRetry,
|
onAutoRetry: this.onAutoRetry,
|
||||||
@ -431,7 +429,6 @@ var ReactS3FineUploader = React.createClass({
|
|||||||
handleCancelFile={this.handleCancelFile}
|
handleCancelFile={this.handleCancelFile}
|
||||||
multiple={this.props.multiple}
|
multiple={this.props.multiple}
|
||||||
dropzoneInactive={!this.props.multiple && this.state.filesToUpload.filter((file) => file.status !== 'deleted' && file.status !== 'canceled').length > 0} />
|
dropzoneInactive={!this.props.multiple && this.state.filesToUpload.filter((file) => file.status !== 'deleted' && file.status !== 'canceled').length > 0} />
|
||||||
<FileDragAndDropToolbar />
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -36,6 +36,8 @@ import GlobalNotificationActions from '../actions/global_notification_actions';
|
|||||||
import apiUrls from '../constants/api_urls';
|
import apiUrls from '../constants/api_urls';
|
||||||
import AppConstants from '../constants/application_constants';
|
import AppConstants from '../constants/application_constants';
|
||||||
|
|
||||||
|
import { getCookie } from '../utils/fetch_api_utils';
|
||||||
|
|
||||||
let Link = Router.Link;
|
let Link = Router.Link;
|
||||||
/**
|
/**
|
||||||
* This is the component that implements display-specific functionality
|
* This is the component that implements display-specific functionality
|
||||||
@ -528,7 +530,10 @@ let FileUploader = React.createClass({
|
|||||||
setUploadStatus={this.props.setUploadStatus}
|
setUploadStatus={this.props.setUploadStatus}
|
||||||
isReadyForFormSubmission={this.props.isReadyForFormSubmission}
|
isReadyForFormSubmission={this.props.isReadyForFormSubmission}
|
||||||
session={{
|
session={{
|
||||||
endpoint: '/api/ownership/loans/contract/'
|
endpoint: AppConstants.serverUrl + 'api/ownership/loans/contract/',
|
||||||
|
customHeaders: {
|
||||||
|
'X-CSRFToken': getCookie('csrftoken')
|
||||||
|
}
|
||||||
}}/>
|
}}/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.file-drag-and-drop-preview-image .delete-file {
|
.file-drag-and-drop-preview-image .action-file {
|
||||||
font-size: 2.5em;
|
font-size: 2.5em;
|
||||||
margin-top: .3em;
|
margin-top: .3em;
|
||||||
color: white;
|
color: white;
|
||||||
@ -82,7 +82,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.file-drag-and-drop-preview-other .delete-file {
|
.file-drag-and-drop-preview-other .action-file {
|
||||||
position: relative;
|
position: relative;
|
||||||
top: .3em;
|
top: .3em;
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user