diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-10-10 15:54:00 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-10-10 15:54:00 +0200 |
| commit | e2a4417079c2ddd1263ec9af2d2930eb65e911f7 (patch) | |
| tree | bb061363b5acffefe29c9de08fd38f5aa02fd1fb /core | |
| parent | e276ffedd3d979c43067c53dd87e8024cd782352 (diff) | |
| download | nextcloud-server-e2a4417079c2ddd1263ec9af2d2930eb65e911f7.tar.gz nextcloud-server-e2a4417079c2ddd1263ec9af2d2930eb65e911f7.zip | |
Fixed conflict dialog in IE8
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/oc-dialogs.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index e5e9f6dbb7d..a9b40918ca7 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -234,7 +234,7 @@ var OCdialogs = { var getCroppedPreview = function(file) { var deferred = new $.Deferred(); // Only process image files. - var type = file.type.split('/').shift(); + var type = file.type && file.type.split('/').shift(); if (window.FileReader && type === 'image') { var reader = new FileReader(); reader.onload = function (e) { |