use nette.ajax.js instead of nette-ajax-form.js

[Ciki]

Use https://github.com/vojtech-dobes/nette.ajax.js for ajaxification

[jkuchar]

Please could you update also the MultipleFileUpload example to reflect this change? Many thanks!

1. 5. 2014 v 13:28, "Ciki" notifications@github.com:

Use https://github.com/vojtech-dobes/nette.ajax.js for ajaxification

You can merge this Pull Request by running

git pull https://github.com/Ciki/MultipleFileUpload patch-nette.ajax.js Or view, comment on, or merge it at:

https://github.com/jkuchar/MultipleFileUpload/pull/8

Commit Summary

use nette.ajax.js instead of nette-ajax-form.js File Changes

M MultipleFileUpload/UI/HTML4SingleUpload/initJS.js (2) M public/MFUFallbackController.js (7) M public/plupload/js/MultipleFileUpload.js (5) M public/swfupload/js/MultipleFileUpload.js (13) M public/uploadify/js/MultipleFileUpload.js (5) Patch Links:

https://github.com/jkuchar/MultipleFileUpload/pull/8.patch https://github.com/jkuchar/MultipleFileUpload/pull/8.diff — Reply to this email directly or view it on GitHub.

[Ciki]

As for the conflicts: I tried to cherry pick commits to make mergable PR but it's a hassle for me. Maybe I'm still not doing it right. So feel free to pick whatever commit you see appropriate from https://github.com/Ciki/MultipleFileUpload/commits/master - it could be probably faster this way

[jkuchar]

There are just only 5 files, I can do that really easily manually.

[Ciki]

sure, I was talking about other commits if you consider them handy - for the future :)

[jkuchar]

Just picked what I was able to merge and what made sence to me. https://github.com/jkuchar/MultipleFileUpload/commits/master

There is also fallback controller refactoring branch, because I'm not sure if this can go into production because I don't have to to study it deeply. :-) https://github.com/jkuchar/MultipleFileUpload/tree/fallback-controller-refactoring

I've given you commit rights to repo. Please write me to my e-mail I want to agree on some rules.