paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 09:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12221 from punchagan/safari-upload-fix

Browse Source 
Fixes couple of problems with image pastes on Safari
This commit is contained in:
Puneeth Chaganti
2019-04-29 05:51:17 +00:00
committed by Tim Abbott
parent f3f172991b
commit 0987ef8809
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend_tests/node_tests/upload.js
View File

@@ -47,7 +47,7 @@ run_test('upload_started', () => {
upload_opts.drop(); upload_opts.drop();
upload_opts.uploadStarted(0, { upload_opts.uploadStarted(0, {
lastModified: 1549958107000, trackingId: "1549958107000",
name: 'some-file', name: 'some-file',
}, 1); }, 1);
@@ -63,7 +63,7 @@ run_test('progress_updated', () => {
assert.equal(width_percent, '39%'); assert.equal(width_percent, '39%');
width_update_checked = true; width_update_checked = true;
}; };
upload_opts.progressUpdated(1, {lastModified: 1549958107000}, 39); upload_opts.progressUpdated(1, {trackingId: "1549958107000"}, 39);
assert(width_update_checked); assert(width_update_checked);
}); });
@@ -88,7 +88,7 @@ run_test('upload_error', () => {
function test(err, msg, server_response = null, file = {}) { function test(err, msg, server_response = null, file = {}) {
setup_test(); setup_test();
file.lastModified = 1549958107000; file.trackingId = "1549958107000";
upload_opts.error(err, server_response, file); upload_opts.error(err, server_response, file);
assert_side_effects(msg); assert_side_effects(msg);
} }
@@ -174,10 +174,10 @@ run_test('upload_finish', () => {
setup(); setup();
upload_opts.uploadFinished(i, { upload_opts.uploadFinished(i, {
lastModified: 1549958107000, trackingId: "1549958107000",
name: 'some-file', name: 'some-file',
}, response); }, response);
upload_opts.progressUpdated(1, {lastModified: 1549958107000}, 100); upload_opts.progressUpdated(1, {trackingId: "1549958107000"}, 100);
assert_side_effects(); assert_side_effects();
} }

17
static/js/upload.js
View File

@@ -68,16 +68,21 @@ exports.options = function (config) {
var uploadStarted = function (i, file) { var uploadStarted = function (i, file) {
error_msg.html($("<p>").text(i18n.t("Uploading…"))); error_msg.html($("<p>").text(i18n.t("Uploading…")));
// Here file.lastModified is unique for each upload // file.lastModified is unique for each upload, and was previously used to track each
// so it is used to track each upload individually // upload. But, when an image is pasted into Safari, it looks like the lastModified time
// gets changed by the time the image upload is finished, and we lose track of the
// uploaded images. Instead, we set a random ID for each image, to track it.
if (!file.trackingId) { // The conditional check is present to make this easy to test
file.trackingId = Math.random().toString().substring(2); // Use digits after the `.`
}
send_status.append('<div class="progress active">' + send_status.append('<div class="progress active">' +
'<div class="bar" id="' + upload_bar + '-' + file.lastModified + '" style="width: 0"></div>' + '<div class="bar" id="' + upload_bar + '-' + file.trackingId + '" style="width: 0"></div>' +
'</div>'); '</div>');
compose_ui.insert_syntax_and_focus("[Uploading " + file.name + "…]()", textarea); compose_ui.insert_syntax_and_focus("[Uploading " + file.name + "…]()", textarea);
}; };
var progressUpdated = function (i, file, progress) { var progressUpdated = function (i, file, progress) {
$("#" + upload_bar + '-' + file.lastModified).width(progress + "%"); $("#" + upload_bar + '-' + file.trackingId).width(progress + "%");
}; };
var uploadError = function (error_code, server_response, file) { var uploadError = function (error_code, server_response, file) {
@@ -85,7 +90,7 @@ exports.options = function (config) {
send_status.addClass("alert-error").removeClass("alert-info"); send_status.addClass("alert-error").removeClass("alert-info");
send_button.prop("disabled", false); send_button.prop("disabled", false);
if (file !== undefined) { if (file !== undefined) {
$("#" + upload_bar + '-' + file.lastModified).parent().remove(); $("#" + upload_bar + '-' + file.trackingId).parent().remove();
} }
switch (error_code) { switch (error_code) {
@@ -145,7 +150,7 @@ exports.options = function (config) {
compose_ui.autosize_textarea(); compose_ui.autosize_textarea();
setTimeout(function () { setTimeout(function () {
$("#" + upload_bar + '-' + file.lastModified).parent().remove(); $("#" + upload_bar + '-' + file.trackingId).parent().remove();
if ($('div.progress.active').length === 0) { if ($('div.progress.active').length === 0) {
hide_upload_status(file); hide_upload_status(file);
} }

5
static/third/jquery-filedrop/jquery.filedrop.js
View File

@@ -237,6 +237,11 @@
}; };
reader.readAsBinaryString(data); reader.readAsBinaryString(data);
opts.uploadStarted(undefined, data); opts.uploadStarted(undefined, data);
// Once the upload has started, the event needn't be processed further. This seems to be required on Safari to
// prevent the Copied Image URL from being pasted along with the uploaded image URL.
event.stopPropagation();
event.preventDefault();
} }
function getBuilder(filename, filedata, mime, boundary) { function getBuilder(filename, filedata, mime, boundary) {