Skip to content
This repository was archived by the owner on Aug 12, 2020. It is now read-only.

8.5.0 to 8.8.2 #37

Merged
merged 10 commits into from
Aug 25, 2013
Merged

8.5.0 to 8.8.2 #37

merged 10 commits into from
Aug 25, 2013

Conversation

ET-CS
Copy link
Collaborator

@ET-CS ET-CS commented Aug 24, 2013

This is a major update. not only I updated up to lastest commit (version 8.8.2 and one commit more) but I added all the demos: Basic, Basic-Plus, Angular, jQuery UI.

Some notes:

  • Working only with Django 1.5+. I used the {% Verbatim %} template tag inside the Angular & jQuery demos.(which will be great too instead of templatetags in the Basic Plus UI demo.
  • Added .jquery.cookies.js for the basic and basic-plus demos to read the csrf cookie.
  • I used newer (not stable release) angular.js release (not like the original Jquery-File-Upload project) due to new settings in that release to supply csrf using other cookie name then default (like Django's). better then changing the csrf cookie name in the Django (I think).
  • I've removed the is_ajax() from the DELETE view. needed to fix angular DELETE method which then was redirected and the UI wasn't updated. Anyway, It's logical to return JSON always. There are not security implications from this.

if you want to merge only the Basic Plus UI version 8.8.2, you can merge commit 76999a7. I finished it and then started adding another demos.

sigurdga added a commit that referenced this pull request Aug 25, 2013
This is a major update from ET-CS. Version 8.8.2(+) and new demos: Basic, Basic-Plus, Angular, jQuery UI.

* Working only with Django 1.5+. Because of the {% Verbatim %} template tag inside the Angular & jQuery demos. Django 1.6 should be just around the corner, deprecating 1.4.
* Added .jquery.cookies.js for the basic and basic-plus demos to read the csrf cookie.
* Used newer (not stable release) angular.js release (not like the original Jquery-File-Upload project) due to new settings in that release to supply csrf using other cookie name than default (like Django's).
* DELETE view will now always return JSON.
@sigurdga sigurdga merged commit 61d68f2 into sigurdga:master Aug 25, 2013
@sigurdga
Copy link
Owner

This is, again, a great example of what you can do. I'm looking forward to test all of the examples! Thanks!

@sigurdga
Copy link
Owner

The examples are great. I had some minor problems, but they are probably not easily fixable, or they have the same issues in the upstream version I guess.

The basic and basic plus do not show already uploaded (probably the same in upstream - the reason for the name "basic" I guess)
The Jquery UI version does not change background when changing theme. At least in my recent Firefox. (Oh. This isn't changed by the themes - my mistake)

But these are really minor, in my point of view. Please don't bother with them unless you know the solution already ;)

@ET-CS
Copy link
Collaborator Author

ET-CS commented Aug 25, 2013

Thank you. the basic and basic plus do not show already uploaded files also in the upstream.

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

Successfully merging this pull request may close these issues.

2 participants