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

Auto upload feature #19

Merged
merged 5 commits into from
Apr 22, 2016
Merged

Conversation

darilek
Copy link
Contributor

@darilek darilek commented Mar 15, 2016

Adds automatic upload feature after user selects files from dialog or drop items

@MikhailTymchukDX MikhailTymchukDX self-assigned this Mar 30, 2016
@MikhailTymchukDX
Copy link
Contributor

@darilek The code throws an error when using bundling. Include modified version of AjaxFileUpload.min.js into the pull request.

return;
}

this._onUploadOrCancelButtonClickedHandler();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Calling _onUploadOrCancelButtonClickedHandler() directly starts upload process before createInputFileElement() call in onFileSelectedHandler:

this.onFileSelectedHandler = function(e) {
    this.addFilesToQueue(e.target.files);
    this.createInputFileElement();
};

Change onFileDroppedHandler() and onFileDroppedHandler() so that startUpload() is called at the end of the methods.

@darilek
Copy link
Contributor Author

darilek commented Apr 19, 2016

Hello I've refactored code as You requested.

@@ -1374,6 +1374,9 @@
<ItemGroup>
<EmbeddedResource Include="Styles\HtmlEditor.DesignPanel.css" />
</ItemGroup>
<ItemGroup>
<None Include="bundleconfig.json" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is not needed, because it is specific to VS 2015 environment.

@MikhailTymchukDX
Copy link
Contributor

The pull request in the current state has conflicts that prevent branches merging.
Please update your code from the latest master branch codebase.

@darilek
Copy link
Contributor Author

darilek commented Apr 21, 2016

I'm sorry, it should be in correct state now

@MikhailTymchukDX
Copy link
Contributor

@darilek Thank you.
Would you please exclude the bundleconfig.json file from the pull request?

- commit minified version once again
@darilek
Copy link
Contributor Author

darilek commented Apr 21, 2016

@MikhailTymchukDX Hello,change commited.

@MikhailTymchukDX
Copy link
Contributor

@darilek You removed bundleconfig.json item from AjaxControlToolkit.csproj, but the file itself is in the repository.

@darilek
Copy link
Contributor Author

darilek commented Apr 22, 2016

I hope it's all right now. I'm sorry, it's my first deeper experience with Git enviroment :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants