Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix:when upload large file,we cant stop #3373

Merged
merged 2 commits into from Mar 8, 2018

Conversation

Projects
None yet
2 participants
@forbxy
Copy link
Contributor

forbxy commented Feb 25, 2018

the cancel button' action only remove its html item, don't stop upload event before

@@ -1220,12 +1220,14 @@ define([
NotebookList.prototype.add_large_file_upload_button = function (file) {
var that = this;
var item = that.new_item(0, true);
var stop_singnal = false;

This comment has been minimized.

@takluyver

takluyver Feb 26, 2018

Member

singnal -> signal

This comment has been minimized.

@takluyver

takluyver Mar 7, 2018

Member

Ping @forbxy - can you make this spelling change?

@@ -1276,6 +1278,9 @@ define([
var upload_file = null;

var large_reader_onload = function (event) {
if (stop_singnal === true) {
return;

This comment has been minimized.

@takluyver

This comment has been minimized.

@forbxy

forbxy Feb 27, 2018

Author Contributor

file reader is a local variable,one chunk one file reader var,we stopped before new file reader create (after last chunk uploaded), so we don't need to abort file reader

This comment has been minimized.

@forbxy

forbxy Mar 7, 2018

Author Contributor

should I make a commit to fix the word(singnal)?or it is already changed after you review?

This comment has been minimized.

@takluyver

takluyver Mar 7, 2018

Member

You'll need to make a commit to fix it - my comment was just pointing it out.

@takluyver takluyver added this to the 5.5 milestone Mar 8, 2018

@takluyver takluyver merged commit c1c7d3d into jupyter:master Mar 8, 2018

4 checks passed

codecov/patch Coverage not affected when comparing 25c628c...191be80
Details
codecov/project 77.71% (-0.23%) compared to 25c628c
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@takluyver

This comment has been minimized.

Copy link
Member

takluyver commented Mar 8, 2018

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.