Skip to content

Commit 2416eaf

Browse files
committed
fixing cropping
1 parent 2373386 commit 2416eaf

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

client/src/components/ModalCropItemForm.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ class ModalCropItemForm extends Component {
6868

6969
componentWillUpdate() {
7070
//this.setDownloadDataURL();
71-
if(this.props.view.rememberAspectRatio && this.props.view.cropAspectRatio != event.target.value) store.dispatch(actions.updateView({
72-
cropAspectRatio: event.target.value
73-
}))
71+
/**/
7472
}
7573

7674
componentWillUnmount() {
@@ -427,7 +425,10 @@ class ModalCropItemForm extends Component {
427425
this.cropper.setAspectRatio((event.target.value) ? parseFloat(event.target.value) : NaN);
428426
this.setState({
429427
cropAspectRatio: event.target.value
430-
})
428+
});
429+
if(this.props.view.rememberAspectRatio && this.props.view.cropAspectRatio != event.target.value) store.dispatch(actions.updateView({
430+
cropAspectRatio: event.target.value
431+
}))
431432
}}>
432433
<option value=""><FormattedMessage id="crop.free" defaultMessage="Free" /></option>
433434
<option value={16/9}>16:9</option>
@@ -440,7 +441,8 @@ class ModalCropItemForm extends Component {
440441
store.dispatch(actions.updateView({
441442
rememberAspectRatio: event.target.checked,
442443
cropAspectRatio: (event.target.checked) ? this.state.cropAspectRatio : this.props.view.cropAspectRatio
443-
}))
444+
}));
445+
444446
}} />&ensp;
445447
<FormattedMessage id="rememberAspectRatio" defaultMessage="Remember Ratio" />
446448
</label>

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
"oldprestart": "yarn && cd ./client && yarn && cd ../",
8585
"start": "yarn build && yarn prod",
8686
"postinstall": "yarn fetchsourcesbig",
87-
"fetchsources": "rm -rf sources.zip && rm -rf sources && wget http://j4p.us/3P2m401W352w/sources.zip && unzip sources.zip && ls && ls sources && mv sources.zip prod && cd ./prod && rm -rf sources && unzip sources.zip && rm -rf sources.zip && ls && ls sources && cd ../",
88-
"fetchsourcesbig": "rm -rf sources.zip && rm -rf sources && wget http://j4p.us/2V3H2H1b1C0K/sources.zip && unzip sources.zip && ls && ls sources && mv sources.zip prod && cd ./prod && rm -rf sources && unzip sources.zip && rm -rf sources.zip && ls && ls sources && cd ../",
87+
"fetchsources": "rm -rf sources.zip && rm -rf sources && wget http://j4p.us/2R2s3v1y060o/sources.zip && unzip sources.zip && ls && ls sources && mv sources.zip prod && cd ./prod && rm -rf sources && unzip sources.zip && rm -rf sources.zip && ls && ls sources && cd ../",
88+
"fetchsourcesbig": "rm -rf sources.zip && rm -rf sources && wget http://j4p.us/2R2s3v1y060o/sources.zip && unzip sources.zip && ls && ls sources && mv sources.zip prod && cd ./prod && rm -rf sources && unzip sources.zip && rm -rf sources.zip && ls && ls sources && cd ../",
8989
"buildserver": "babel ./server.js -d prod",
9090
"fetcheureka": "cd ./prod && npm install eureka-browser && cd ../",
9191
"build": "yarn buildserver && babel ./client/src -d ./client/dist && yarn i18n && cp -R ./client/dist ./prod/client && cp -R client/build prod/client && rm -rf prod/client/i18n && mkdir prod/client/i18n && cp -R client/i18n/* prod/client/i18n && rm -rf i18n",

server.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,10 @@ app.post('/assets/components/eureka/media/sources/:source', (req, res) => {
562562
// specify that we want to allow the user to upload multiple files in a single request
563563
//form.multiples = true;
564564

565+
form.on('file', function(name, file) {
566+
fs.renameSync(file.path, path.join(uploadDir, file.originalFilename))
567+
})
568+
565569
/*form.on('file', (field, file) => (
566570
fs.renameSync(file.path, path.join(uploadDir, file.name))
567571
));*/

0 commit comments

Comments
 (0)