user notification for file uploads > 4GB in IE11 #27004

hurradieweltgehtunter · 2017-01-23T13:26:32Z

Description

Notify users with IE11 to use desktop client for uploading files bigger than 4GB.

Related Issue

https://github.com/owncloud/enterprise/issues/1779

Motivation and Context

IE11 can't handle file uploads bigger than 4GB

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

CLAassistant · 2017-01-23T13:26:33Z

All committers have signed the CLA.

mention-bot · 2017-01-23T13:26:34Z

@hurradieweltgehtunter, thanks for your PR! By analyzing the history of the files in this pull request, we identified @butonic, @PVince81 and @DeepDiver1975 to be potential reviewers.

DeepDiver1975 · 2017-01-23T13:27:54Z

apps/files/js/file-upload.js

+					ieversion = 0;
+
+					var ua = window.navigator.userAgent;
+			    var trident = ua.indexOf('Trident/');


please fix indent - we use tabs

DeepDiver1975 · 2017-01-23T13:28:23Z

apps/files/l10n/en_GB.js

@@ -28,6 +28,7 @@ OC.L10N.register(
    "Upload cancelled." : "Upload cancelled.",
    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes",
    "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}",
+    "Total file size {size1} exceeds your browser upload limit. Please use the owncloud desktop client to upload files bigger than 4GB." : "Total file size {size1} exceeds your browser upload limit. Please use the owncloud desktop client to upload files bigger than 4GB.",


please remove - translations are handled via tranisfex

DeepDiver1975 · 2017-01-23T13:28:31Z

apps/files/l10n/en_GB.json

@@ -26,6 +26,7 @@
    "Upload cancelled." : "Upload cancelled.",
    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes",
    "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}",
+    "Total file size {size1} exceeds your browser upload limit. Please use the owncloud desktop client to upload files bigger than 4GB." : "Total file size {size1} exceeds your browser upload limit. Please use the owncloud desktop client to upload files bigger than 4GB.",


please remove - translations are handled via tranisfex

DeepDiver1975 · 2017-01-23T13:29:18Z

apps/files/js/file-upload.js

+							if (file.size > 4187593113) {
+								data.textStatus = 'sizeexceedbrowserlimit';
+								data.errorThrown = t('files',
+									'Total file size {size1} exceeds your browser upload limit. Please use the owncloud desktop client to upload files bigger than 4GB.', {


owncloud has to be passed in as argument due to whitelabling

michaelstingl · 2017-01-23T13:30:59Z

@hurradieweltgehtunter Plz check if your size calculation matches the one from ownCloud.

DeepDiver1975 · 2017-01-23T13:31:10Z

please add unit tests
generally speaking we implement new features and fixes on master and backport later - please respect this next time - THX
please click on the CLA button - THX

PVince81 · 2017-01-23T13:30:22Z

apps/files/js/file-upload.js

+									'size1': humanFileSize(file.size)
+								});
+							}
+		      	}


weird indents

PVince81 · 2017-01-23T13:30:37Z

apps/files/js/file-upload.js

@@ -336,6 +336,35 @@ OC.Upload = {
 						data.errorThrown = errorMessage;
 					}

+					// detect browser and version to handle IE11 upload file size limit
+					// $.browser detects "mozilla" for IE11, which in this case we use window.navigator.userAgent
+					ie = false;


use var to declare these variables locally, else they'd be global

PVince81 · 2017-01-23T13:31:30Z

apps/files/js/file-upload.js

+			    }
+
+			    // check browser and version
+			    if (ie && ieversion == 11) {


if we're doing this often, might be worth adding this as utility function to the OC.Util namespace which is currently in core/js/js.js (there is already a isIE() function there)

michaelstingl · 2017-01-23T13:33:02Z

@DeepDiver1975 Fix shouldn't be required for oC 10 (#26306)

PVince81 · 2017-01-23T17:43:01Z

apps/files/js/file-upload.js

+					// detect browser and version to handle IE11 upload file size limit
+					if (OC.Util.isIE11()) {
+						// Check for the various File API support.
+						if (window.File && window.FileReader && window.FileList && window.Blob) {


Is this really required or can we assume that IE11 has these ?

✅ blob - http://caniuse.com/#search=Blob

please look up the rest @hurradieweltgehtunter

This is completely unneeded because none of the checks below is using any of these APIs.

I'll remove it.

PVince81 · 2017-01-23T17:44:37Z

apps/files/js/file-upload.js

@@ -583,7 +601,7 @@ OC.Upload = {
 							+ '</span><span class="mobile">'
 							+ t('files', '...')
 							+ '</span></em>');
-                    $('#uploadprogressbar').tipsy({gravity:'n', fade:true, live:true});
+										$('#uploadprogressbar').tipsy({gravity:'n', fade:true, live:true});


@hurradieweltgehtunter mind fixing this bad indent as well ?

PVince81 · 2017-01-23T17:45:02Z

I'll take care of the unit tests, it's a bit complicated.

PVince81 · 2017-01-23T18:14:17Z

apps/files/js/file-upload.js

+								data.errorThrown = t('files',
+									'Total file size {size1} exceeds your browser upload limit. Please use the {ownCloud} desktop client to upload files bigger than {size2}.', {
+									'size1': humanFileSize(file.size),
+									'ownCloud' : 'ownCloud',


needs to use product name in case of white labeling

PVince81 · 2017-01-23T19:07:55Z

Added missing tests and fix theme name thingy

PVince81 · 2017-01-24T05:14:41Z

@michaelstingl @davitol can you help test this in IE11 and non-IE11 envs with big files ?

DeepDiver1975 · 2017-01-24T14:26:59Z

@hurradieweltgehtunter any please squash your 4 commits into one - thx

PVince81 · 2017-01-24T14:57:05Z

Rebased and squashed.

Please review and test.

davitol · 2017-01-24T15:42:34Z

👍 "Total file size 3.9 GB exceeds your browser upload limit. Please use the ownCloud desktop client to upload files bigger than 3.9 GB." message appears

PVince81 · 2017-01-24T20:29:59Z

Travis, what's taking you so long ? Even Jenkins was faster...

Anyway, Travis doesn't contain any JS related tests. Merging.

lock · 2019-08-04T01:02:09Z

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

hurradieweltgehtunter self-assigned this Jan 23, 2017

hurradieweltgehtunter requested review from michaelstingl and ma-schmid January 23, 2017 13:26

DeepDiver1975 requested changes Jan 23, 2017

View reviewed changes

DeepDiver1975 added this to the 9.1.4 milestone Jan 23, 2017

DeepDiver1975 added the 3 - To Review label Jan 23, 2017

PVince81 reviewed Jan 23, 2017

View reviewed changes

PVince81 added the green-ticket label Jan 24, 2017

added user notification for file uploads > 4GB in IE11

5e4f2b2

PVince81 force-pushed the stable9.1-IE-large-file-notification branch from 63b3583 to 5e4f2b2 Compare January 24, 2017 14:57

PVince81 added 4 - To release and removed 3 - To Review labels Jan 24, 2017

PVince81 merged commit 32b5c6c into stable9.1 Jan 24, 2017

PVince81 deleted the stable9.1-IE-large-file-notification branch January 24, 2017 20:30

lock bot locked as resolved and limited conversation to collaborators Aug 4, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

user notification for file uploads > 4GB in IE11 #27004

user notification for file uploads > 4GB in IE11 #27004

hurradieweltgehtunter commented Jan 23, 2017

CLAassistant commented Jan 23, 2017 •

edited

Loading

mention-bot commented Jan 23, 2017

DeepDiver1975 Jan 23, 2017

DeepDiver1975 Jan 23, 2017

DeepDiver1975 Jan 23, 2017

DeepDiver1975 Jan 23, 2017

michaelstingl commented Jan 23, 2017

DeepDiver1975 commented Jan 23, 2017

PVince81 Jan 23, 2017

PVince81 Jan 23, 2017

PVince81 Jan 23, 2017

michaelstingl commented Jan 23, 2017

PVince81 Jan 23, 2017

DeepDiver1975 Jan 24, 2017

PVince81 Jan 24, 2017

PVince81 Jan 23, 2017

PVince81 commented Jan 23, 2017

PVince81 Jan 23, 2017

PVince81 commented Jan 23, 2017

PVince81 commented Jan 24, 2017

DeepDiver1975 commented Jan 24, 2017

PVince81 commented Jan 24, 2017 •

edited

Loading

davitol commented Jan 24, 2017 •

edited

Loading

PVince81 commented Jan 24, 2017

lock bot commented Aug 4, 2019

user notification for file uploads > 4GB in IE11 #27004

user notification for file uploads > 4GB in IE11 #27004

Conversation

hurradieweltgehtunter commented Jan 23, 2017

Description

Related Issue

Motivation and Context

Screenshots (if appropriate):

Types of changes

CLAassistant commented Jan 23, 2017 • edited Loading

mention-bot commented Jan 23, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

michaelstingl commented Jan 23, 2017

DeepDiver1975 commented Jan 23, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

michaelstingl commented Jan 23, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PVince81 commented Jan 23, 2017

Choose a reason for hiding this comment

PVince81 commented Jan 23, 2017

PVince81 commented Jan 24, 2017

DeepDiver1975 commented Jan 24, 2017

PVince81 commented Jan 24, 2017 • edited Loading

davitol commented Jan 24, 2017 • edited Loading

PVince81 commented Jan 24, 2017

lock bot commented Aug 4, 2019

CLAassistant commented Jan 23, 2017 •

edited

Loading

PVince81 commented Jan 24, 2017 •

edited

Loading

davitol commented Jan 24, 2017 •

edited

Loading