Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

🐛 Fixed editor and drag/drop image uploads in IE11 (#926)

Browse source 
closes https://github.com/TryGhost/Ghost/issues/9321
- don't use `dataTransfer.effectAllowed` in IE11
- only fire the action in `{{gh-file-input}}` if there are files selected to prevent a double call to the action due to resetting the input
This commit is contained in:
Kevin Ansfield 2017-12-12 11:53:35 +00:00 • committed by GitHub
parent 97ffb63203
commit 14f03a14a8
6 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ghost/admin/app/components/gh-editor.js
View file

@ -89,8 +89,10 @@ export default Component.extend({
// this is needed to work around inconsistencies with dropping files // this is needed to work around inconsistencies with dropping files
// from Chrome's downloads bar // from Chrome's downloads bar
let eA = event.dataTransfer.effectAllowed; if (navigator.userAgent.indexOf('Chrome') > -1) {
event.dataTransfer.dropEffect = (eA === 'move' || eA === 'linkMove') ? 'move' : 'copy'; let eA = event.dataTransfer.effectAllowed;
event.dataTransfer.dropEffect = (eA === 'move' || eA === 'linkMove') ? 'move' : 'copy';
}
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();

6
ghost/admin/app/components/gh-file-input.js
View file

@ -6,8 +6,10 @@ import XFileInput from 'emberx-file-input/components/x-file-input';
export default XFileInput.extend({ export default XFileInput.extend({
change(e) { change(e) {
let action = this.get('action'); let action = this.get('action');
if (action) { let files = this.files(e);
action(this.files(e), this.resetInput.bind(this));
if (files.length && action) {
action(files, this.resetInput.bind(this));
} }
}, },

6
ghost/admin/app/components/gh-file-uploader.js
View file

@ -109,8 +109,10 @@ export default Component.extend({
// this is needed to work around inconsistencies with dropping files // this is needed to work around inconsistencies with dropping files
// from Chrome's downloads bar // from Chrome's downloads bar
let eA = event.dataTransfer.effectAllowed; if (navigator.userAgent.indexOf('Chrome') > -1) {
event.dataTransfer.dropEffect = (eA === 'move' || eA === 'linkMove') ? 'move' : 'copy'; let eA = event.dataTransfer.effectAllowed;
event.dataTransfer.dropEffect = (eA === 'move' || eA === 'linkMove') ? 'move' : 'copy';
}
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();

6
ghost/admin/app/components/gh-image-uploader.js
View file

@ -100,8 +100,10 @@ export default Component.extend({
// this is needed to work around inconsistencies with dropping files // this is needed to work around inconsistencies with dropping files
// from Chrome's downloads bar // from Chrome's downloads bar
let eA = event.dataTransfer.effectAllowed; if (navigator.userAgent.indexOf('Chrome') > -1) {
event.dataTransfer.dropEffect = (eA === 'move' || eA === 'linkMove') ? 'move' : 'copy'; let eA = event.dataTransfer.effectAllowed;
event.dataTransfer.dropEffect = (eA === 'move' || eA === 'linkMove') ? 'move' : 'copy';
}
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();

6
ghost/admin/app/components/gh-profile-image.js
View file

@ -62,8 +62,10 @@ export default Component.extend({
// this is needed to work around inconsistencies with dropping files // this is needed to work around inconsistencies with dropping files
// from Chrome's downloads bar // from Chrome's downloads bar
let eA = event.dataTransfer.effectAllowed; if (navigator.userAgent.indexOf('Chrome') > -1) {
event.dataTransfer.dropEffect = (eA === 'move' || eA === 'linkMove') ? 'move' : 'copy'; let eA = event.dataTransfer.effectAllowed;
event.dataTransfer.dropEffect = (eA === 'move' || eA === 'linkMove') ? 'move' : 'copy';
}
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();

6
ghost/admin/lib/gh-koenig/addon/components/cards/card-image.js
View file

@ -86,8 +86,10 @@ export default Component.extend({
// this is needed to work around inconsistencies with dropping files // this is needed to work around inconsistencies with dropping files
// from Chrome's downloads bar // from Chrome's downloads bar
let eA = event.dataTransfer.effectAllowed; if (navigator.userAgent.indexOf('Chrome') > -1) {
event.dataTransfer.dropEffect = (eA === 'move' || eA === 'linkMove') ? 'move' : 'copy'; let eA = event.dataTransfer.effectAllowed;
event.dataTransfer.dropEffect = (eA === 'move' || eA === 'linkMove') ? 'move' : 'copy';
}
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();