From 8893592d52548f4476ed04baee02e85ae07d7adb Mon Sep 17 00:00:00 2001 From: Scott Bradley Date: Sat, 25 Oct 2014 18:23:04 -0500 Subject: [PATCH 1/2] Fixes simplejson; moves static files into app specific folder --- fileupload/response.py | 4 ++-- .../{ => fileupload}/css/blueimp-gallery.min.css | 0 fileupload/static/{ => fileupload}/css/demo-ie8.css | 0 fileupload/static/{ => fileupload}/css/demo.css | 0 .../css/jquery.fileupload-ui-noscript.css | 0 .../{ => fileupload}/css/jquery.fileupload-ui.css | 0 fileupload/static/{ => fileupload}/css/style.css | 0 fileupload/static/{ => fileupload}/img/loading.gif | Bin .../static/{ => fileupload}/img/progressbar.gif | Bin fileupload/static/{ => fileupload}/js/app.js | 0 .../static/{ => fileupload}/js/bootstrap.min.js | 0 .../{ => fileupload}/js/canvas-to-blob.min.js | 0 .../js/cors/jquery.postmessage-transport.js | 0 .../js/cors/jquery.xdr-transport.js | 0 fileupload/static/{ => fileupload}/js/csrf.js | 0 .../js/jquery.blueimp-gallery.min.js | 0 .../static/{ => fileupload}/js/jquery.cookie.js | 0 .../js/jquery.fileupload-angular.js | 0 .../{ => fileupload}/js/jquery.fileupload-audio.js | 0 .../{ => fileupload}/js/jquery.fileupload-image.js | 0 .../js/jquery.fileupload-jquery-ui.js | 0 .../js/jquery.fileupload-process.js | 0 .../{ => fileupload}/js/jquery.fileupload-ui.js | 0 .../js/jquery.fileupload-validate.js | 0 .../{ => fileupload}/js/jquery.fileupload-video.js | 0 .../static/{ => fileupload}/js/jquery.fileupload.js | 0 .../{ => fileupload}/js/jquery.iframe-transport.js | 0 .../static/{ => fileupload}/js/jquery.ui.widget.js | 0 .../static/{ => fileupload}/js/load-image.min.js | 0 fileupload/static/{ => fileupload}/js/locale.js | 0 fileupload/static/{ => fileupload}/js/main.js | 0 fileupload/static/{ => fileupload}/js/tmpl.min.js | 0 .../{ => fileupload}/js/vendor/jquery.ui.widget.js | 0 33 files changed, 2 insertions(+), 2 deletions(-) rename fileupload/static/{ => fileupload}/css/blueimp-gallery.min.css (100%) rename fileupload/static/{ => fileupload}/css/demo-ie8.css (100%) rename fileupload/static/{ => fileupload}/css/demo.css (100%) rename fileupload/static/{ => fileupload}/css/jquery.fileupload-ui-noscript.css (100%) rename fileupload/static/{ => fileupload}/css/jquery.fileupload-ui.css (100%) rename fileupload/static/{ => fileupload}/css/style.css (100%) rename fileupload/static/{ => fileupload}/img/loading.gif (100%) rename fileupload/static/{ => fileupload}/img/progressbar.gif (100%) rename fileupload/static/{ => fileupload}/js/app.js (100%) rename fileupload/static/{ => fileupload}/js/bootstrap.min.js (100%) rename fileupload/static/{ => fileupload}/js/canvas-to-blob.min.js (100%) rename fileupload/static/{ => fileupload}/js/cors/jquery.postmessage-transport.js (100%) rename fileupload/static/{ => fileupload}/js/cors/jquery.xdr-transport.js (100%) rename fileupload/static/{ => fileupload}/js/csrf.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.blueimp-gallery.min.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.cookie.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.fileupload-angular.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.fileupload-audio.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.fileupload-image.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.fileupload-jquery-ui.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.fileupload-process.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.fileupload-ui.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.fileupload-validate.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.fileupload-video.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.fileupload.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.iframe-transport.js (100%) rename fileupload/static/{ => fileupload}/js/jquery.ui.widget.js (100%) rename fileupload/static/{ => fileupload}/js/load-image.min.js (100%) rename fileupload/static/{ => fileupload}/js/locale.js (100%) rename fileupload/static/{ => fileupload}/js/main.js (100%) rename fileupload/static/{ => fileupload}/js/tmpl.min.js (100%) rename fileupload/static/{ => fileupload}/js/vendor/jquery.ui.widget.js (100%) diff --git a/fileupload/response.py b/fileupload/response.py index 829685a..76ab317 100644 --- a/fileupload/response.py +++ b/fileupload/response.py @@ -1,6 +1,6 @@ # encoding: utf-8 +import json from django.http import HttpResponse -from django.utils import simplejson MIMEANY = '*/*' MIMEJSON = 'application/json' @@ -34,5 +34,5 @@ def a_iew(request): """ def __init__(self, obj='', json_opts=None, mimetype=MIMEJSON, *args, **kwargs): json_opts = json_opts if isinstance(json_opts, dict) else {} - content = simplejson.dumps(obj, **json_opts) + content = json.dumps(obj, **json_opts) super(JSONResponse, self).__init__(content, mimetype, *args, **kwargs) diff --git a/fileupload/static/css/blueimp-gallery.min.css b/fileupload/static/fileupload/css/blueimp-gallery.min.css similarity index 100% rename from fileupload/static/css/blueimp-gallery.min.css rename to fileupload/static/fileupload/css/blueimp-gallery.min.css diff --git a/fileupload/static/css/demo-ie8.css b/fileupload/static/fileupload/css/demo-ie8.css similarity index 100% rename from fileupload/static/css/demo-ie8.css rename to fileupload/static/fileupload/css/demo-ie8.css diff --git a/fileupload/static/css/demo.css b/fileupload/static/fileupload/css/demo.css similarity index 100% rename from fileupload/static/css/demo.css rename to fileupload/static/fileupload/css/demo.css diff --git a/fileupload/static/css/jquery.fileupload-ui-noscript.css b/fileupload/static/fileupload/css/jquery.fileupload-ui-noscript.css similarity index 100% rename from fileupload/static/css/jquery.fileupload-ui-noscript.css rename to fileupload/static/fileupload/css/jquery.fileupload-ui-noscript.css diff --git a/fileupload/static/css/jquery.fileupload-ui.css b/fileupload/static/fileupload/css/jquery.fileupload-ui.css similarity index 100% rename from fileupload/static/css/jquery.fileupload-ui.css rename to fileupload/static/fileupload/css/jquery.fileupload-ui.css diff --git a/fileupload/static/css/style.css b/fileupload/static/fileupload/css/style.css similarity index 100% rename from fileupload/static/css/style.css rename to fileupload/static/fileupload/css/style.css diff --git a/fileupload/static/img/loading.gif b/fileupload/static/fileupload/img/loading.gif similarity index 100% rename from fileupload/static/img/loading.gif rename to fileupload/static/fileupload/img/loading.gif diff --git a/fileupload/static/img/progressbar.gif b/fileupload/static/fileupload/img/progressbar.gif similarity index 100% rename from fileupload/static/img/progressbar.gif rename to fileupload/static/fileupload/img/progressbar.gif diff --git a/fileupload/static/js/app.js b/fileupload/static/fileupload/js/app.js similarity index 100% rename from fileupload/static/js/app.js rename to fileupload/static/fileupload/js/app.js diff --git a/fileupload/static/js/bootstrap.min.js b/fileupload/static/fileupload/js/bootstrap.min.js similarity index 100% rename from fileupload/static/js/bootstrap.min.js rename to fileupload/static/fileupload/js/bootstrap.min.js diff --git a/fileupload/static/js/canvas-to-blob.min.js b/fileupload/static/fileupload/js/canvas-to-blob.min.js similarity index 100% rename from fileupload/static/js/canvas-to-blob.min.js rename to fileupload/static/fileupload/js/canvas-to-blob.min.js diff --git a/fileupload/static/js/cors/jquery.postmessage-transport.js b/fileupload/static/fileupload/js/cors/jquery.postmessage-transport.js similarity index 100% rename from fileupload/static/js/cors/jquery.postmessage-transport.js rename to fileupload/static/fileupload/js/cors/jquery.postmessage-transport.js diff --git a/fileupload/static/js/cors/jquery.xdr-transport.js b/fileupload/static/fileupload/js/cors/jquery.xdr-transport.js similarity index 100% rename from fileupload/static/js/cors/jquery.xdr-transport.js rename to fileupload/static/fileupload/js/cors/jquery.xdr-transport.js diff --git a/fileupload/static/js/csrf.js b/fileupload/static/fileupload/js/csrf.js similarity index 100% rename from fileupload/static/js/csrf.js rename to fileupload/static/fileupload/js/csrf.js diff --git a/fileupload/static/js/jquery.blueimp-gallery.min.js b/fileupload/static/fileupload/js/jquery.blueimp-gallery.min.js similarity index 100% rename from fileupload/static/js/jquery.blueimp-gallery.min.js rename to fileupload/static/fileupload/js/jquery.blueimp-gallery.min.js diff --git a/fileupload/static/js/jquery.cookie.js b/fileupload/static/fileupload/js/jquery.cookie.js similarity index 100% rename from fileupload/static/js/jquery.cookie.js rename to fileupload/static/fileupload/js/jquery.cookie.js diff --git a/fileupload/static/js/jquery.fileupload-angular.js b/fileupload/static/fileupload/js/jquery.fileupload-angular.js similarity index 100% rename from fileupload/static/js/jquery.fileupload-angular.js rename to fileupload/static/fileupload/js/jquery.fileupload-angular.js diff --git a/fileupload/static/js/jquery.fileupload-audio.js b/fileupload/static/fileupload/js/jquery.fileupload-audio.js similarity index 100% rename from fileupload/static/js/jquery.fileupload-audio.js rename to fileupload/static/fileupload/js/jquery.fileupload-audio.js diff --git a/fileupload/static/js/jquery.fileupload-image.js b/fileupload/static/fileupload/js/jquery.fileupload-image.js similarity index 100% rename from fileupload/static/js/jquery.fileupload-image.js rename to fileupload/static/fileupload/js/jquery.fileupload-image.js diff --git a/fileupload/static/js/jquery.fileupload-jquery-ui.js b/fileupload/static/fileupload/js/jquery.fileupload-jquery-ui.js similarity index 100% rename from fileupload/static/js/jquery.fileupload-jquery-ui.js rename to fileupload/static/fileupload/js/jquery.fileupload-jquery-ui.js diff --git a/fileupload/static/js/jquery.fileupload-process.js b/fileupload/static/fileupload/js/jquery.fileupload-process.js similarity index 100% rename from fileupload/static/js/jquery.fileupload-process.js rename to fileupload/static/fileupload/js/jquery.fileupload-process.js diff --git a/fileupload/static/js/jquery.fileupload-ui.js b/fileupload/static/fileupload/js/jquery.fileupload-ui.js similarity index 100% rename from fileupload/static/js/jquery.fileupload-ui.js rename to fileupload/static/fileupload/js/jquery.fileupload-ui.js diff --git a/fileupload/static/js/jquery.fileupload-validate.js b/fileupload/static/fileupload/js/jquery.fileupload-validate.js similarity index 100% rename from fileupload/static/js/jquery.fileupload-validate.js rename to fileupload/static/fileupload/js/jquery.fileupload-validate.js diff --git a/fileupload/static/js/jquery.fileupload-video.js b/fileupload/static/fileupload/js/jquery.fileupload-video.js similarity index 100% rename from fileupload/static/js/jquery.fileupload-video.js rename to fileupload/static/fileupload/js/jquery.fileupload-video.js diff --git a/fileupload/static/js/jquery.fileupload.js b/fileupload/static/fileupload/js/jquery.fileupload.js similarity index 100% rename from fileupload/static/js/jquery.fileupload.js rename to fileupload/static/fileupload/js/jquery.fileupload.js diff --git a/fileupload/static/js/jquery.iframe-transport.js b/fileupload/static/fileupload/js/jquery.iframe-transport.js similarity index 100% rename from fileupload/static/js/jquery.iframe-transport.js rename to fileupload/static/fileupload/js/jquery.iframe-transport.js diff --git a/fileupload/static/js/jquery.ui.widget.js b/fileupload/static/fileupload/js/jquery.ui.widget.js similarity index 100% rename from fileupload/static/js/jquery.ui.widget.js rename to fileupload/static/fileupload/js/jquery.ui.widget.js diff --git a/fileupload/static/js/load-image.min.js b/fileupload/static/fileupload/js/load-image.min.js similarity index 100% rename from fileupload/static/js/load-image.min.js rename to fileupload/static/fileupload/js/load-image.min.js diff --git a/fileupload/static/js/locale.js b/fileupload/static/fileupload/js/locale.js similarity index 100% rename from fileupload/static/js/locale.js rename to fileupload/static/fileupload/js/locale.js diff --git a/fileupload/static/js/main.js b/fileupload/static/fileupload/js/main.js similarity index 100% rename from fileupload/static/js/main.js rename to fileupload/static/fileupload/js/main.js diff --git a/fileupload/static/js/tmpl.min.js b/fileupload/static/fileupload/js/tmpl.min.js similarity index 100% rename from fileupload/static/js/tmpl.min.js rename to fileupload/static/fileupload/js/tmpl.min.js diff --git a/fileupload/static/js/vendor/jquery.ui.widget.js b/fileupload/static/fileupload/js/vendor/jquery.ui.widget.js similarity index 100% rename from fileupload/static/js/vendor/jquery.ui.widget.js rename to fileupload/static/fileupload/js/vendor/jquery.ui.widget.js From 5e9fcbf684e48c316fcb13793aa49933881984cf Mon Sep 17 00:00:00 2001 From: Scott Bradley Date: Sat, 25 Oct 2014 18:39:56 -0500 Subject: [PATCH 2/2] Adds fork notice to readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 8f185a9..5deda81 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +Fork Notice +=========== +Special thanks to @sigurdga for this valuable django package. This is my personal fork of django-jquery-file-upload with tweaks for my own projects. Please see the original code and licensing information at: https://github.com/sigurdga/django-jquery-file-upload + [jQuery-File-Upload](http://aquantum-demo.appspot.com/file-upload) is developed by Sebastian Tschan, with the source available on [github](https://github.com/blueimp/jQuery-File-Upload). Example code is [ported to Django](https://github.com/sigurdga/django-jquery-file-upload) by Sigurd Gartmann ([sigurdga on github](https://github.com/sigurdga/)). Introduction