From 2cf229a95d25a9e3b37b823e47171c02df98f94a Mon Sep 17 00:00:00 2001 From: brossdu Date: Tue, 17 Dec 2013 17:09:49 +0100 Subject: [PATCH 1/9] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 5d2e1a0..a4c1067 100644 --- a/README.md +++ b/README.md @@ -337,9 +337,13 @@ This bundle accesses the file system via the `glob()` function. It won't work ou Syncing files back and forth to follow the editId pattern might not be agreeable if your attachments are very large. In that case, don't use the editId pattern. One alternative is to create objects immediately in the database and not show them in the list view until you mark them live. This way your edit action can use the permanent id of the object as part of the `folder` option, and nothing has to be synced. In this scenario you should probably move the attachments list below the form to hint to the user that there is no such thing as "cancelling" those actions. +TODO : Add all jquery options. + Notes ===== The uploader has been styled using Bootstrap conventions. If you have Bootstrap in your project, the uploader should look reasonably pretty out of the box. The "Choose Files" button allows multiple select as well as drag and drop. + + From 6f29cd5f82b935e78de0e8d9cab6e1179754451a Mon Sep 17 00:00:00 2001 From: brossdu Date: Tue, 17 Dec 2013 17:13:59 +0100 Subject: [PATCH 2/9] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index a4c1067..70c160a 100644 --- a/README.md +++ b/README.md @@ -337,7 +337,6 @@ This bundle accesses the file system via the `glob()` function. It won't work ou Syncing files back and forth to follow the editId pattern might not be agreeable if your attachments are very large. In that case, don't use the editId pattern. One alternative is to create objects immediately in the database and not show them in the list view until you mark them live. This way your edit action can use the permanent id of the object as part of the `folder` option, and nothing has to be synced. In this scenario you should probably move the attachments list below the form to hint to the user that there is no such thing as "cancelling" those actions. -TODO : Add all jquery options. Notes ===== From 4f9e7c56a0ea641c304b86dc918d260ab19145b8 Mon Sep 17 00:00:00 2001 From: brossdu Date: Tue, 17 Dec 2013 18:02:33 +0100 Subject: [PATCH 3/9] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 70c160a..6aaebb5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ PunkAveFileUploaderBundle ========================= -Introduction +THIS IS A TEST DO NOT FORK YET + +Introduction ============ This bundle provides multiple file uploads, based on the [BlueImp jQuery file uploader](https://github.com/blueimp/jQuery-File-Upload/) package. Both drag and drop and multiple file selection are fully supported in compatible browsers. We chose BlueImp because it has excellent backwards and forwards browser compatibility. From 799e8af36bd4531265f292e029609c0db00ac28e Mon Sep 17 00:00:00 2001 From: Pierre Date: Tue, 17 Dec 2013 18:14:05 +0100 Subject: [PATCH 4/9] option sequential --- Resources/public/js/FileUploader.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/public/js/FileUploader.js b/Resources/public/js/FileUploader.js index 280e649..2a3c482 100644 --- a/Resources/public/js/FileUploader.js +++ b/Resources/public/js/FileUploader.js @@ -68,6 +68,7 @@ function PunkAveFileUploader(options) dataType: 'json', url: uploadUrl, dropZone: $el.find('[data-dropzone="1"]'), + sequentialUploads: (options.sequentialUploads)? true:false, done: function (e, data) { if (data) { From f87ad9c0e06bb0aef2510b8879d38420b6c19e19 Mon Sep 17 00:00:00 2001 From: Pierre Date: Tue, 17 Dec 2013 18:19:10 +0100 Subject: [PATCH 5/9] sequential option cleaner --- .gitignore | 2 ++ Resources/public/js/FileUploader.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5509140..62798a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ *.DS_Store + +.project diff --git a/Resources/public/js/FileUploader.js b/Resources/public/js/FileUploader.js index 2a3c482..6a9280b 100644 --- a/Resources/public/js/FileUploader.js +++ b/Resources/public/js/FileUploader.js @@ -68,7 +68,7 @@ function PunkAveFileUploader(options) dataType: 'json', url: uploadUrl, dropZone: $el.find('[data-dropzone="1"]'), - sequentialUploads: (options.sequentialUploads)? true:false, + sequentialUploads: (options.sequentialUploads), done: function (e, data) { if (data) { From dd47239e17488d4afe264d150512418d11a1e001 Mon Sep 17 00:00:00 2001 From: brossdu Date: Tue, 17 Dec 2013 18:40:30 +0100 Subject: [PATCH 6/9] Update README.md --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6aaebb5..cf7e9ed 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ PunkAveFileUploaderBundle ========================= -THIS IS A TEST DO NOT FORK YET Introduction ============ @@ -331,6 +330,18 @@ You'll probably want to add an error handler for this case. In the template wher } }); }); + +Use sequential uploads +-------------------------------- + +You can use the sequentialUpload options by adding this line on your JS call + + $(function() { + new PunkAveFileUploader({ + // ... other required options, + 'sequentialUploads': true + }); + }); Limitations =========== From 1f2c1a6ad3b3d2008cd915fefb63de1330c508b3 Mon Sep 17 00:00:00 2001 From: brossdu Date: Wed, 8 Jan 2014 15:38:36 +0100 Subject: [PATCH 7/9] Update composer.json --- composer.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index f7b0639..568ac9f 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "punkave/symfony2-file-uploader-bundle", + "name": "brossdu/symfony2-file-uploader-bundle", "type": "symfony-bundle", "description": "Multiple file uploads for Symfony2 with the BlueImp uploader. Also scales uploaded images", "keywords": ["upload", "file", "multiple file upload", "uploader", "blueimp", "symfony", "symfony bundle", "bundle", "punkave", "image transform", "symfony-2.0", "symfony-2.1"], @@ -13,16 +13,21 @@ { "name": "Wes John-Alder", "email": "wes@punkave.com" + }, + { + "name": "Pierre Brossard", + "email": "brossard.p@gmail.com" } + ], "require": { "php": ">=5.3.2", "symfony/framework-bundle": "2.*" }, "autoload": { - "psr-0": { "PunkAve\\FileUploaderBundle": "" } + "psr-0": { "Brossdu\\FileUploaderBundle": "" } }, - "target-dir": "PunkAve/FileUploaderBundle", + "target-dir": "Brossdu/FileUploaderBundle", "minimum-stability": "dev", "extra": { "branch-alias": { From ee03eb742e43d460df7fe6cb88e3ead00884af1d Mon Sep 17 00:00:00 2001 From: brossdu Date: Wed, 8 Jan 2014 15:39:03 +0100 Subject: [PATCH 8/9] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 568ac9f..03d5664 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "symfony-bundle", "description": "Multiple file uploads for Symfony2 with the BlueImp uploader. Also scales uploaded images", "keywords": ["upload", "file", "multiple file upload", "uploader", "blueimp", "symfony", "symfony bundle", "bundle", "punkave", "image transform", "symfony-2.0", "symfony-2.1"], - "homepage": "https://github.com/punkave/symfony2-file-uploader-bundle", + "homepage": "https://github.com/brossdu/symfony2-file-uploader-bundle", "license": "MIT", "authors": [ { From 06022309d9d64507265c3d1c2780d1b61fa2f029 Mon Sep 17 00:00:00 2001 From: brossdu Date: Wed, 8 Jan 2014 15:52:42 +0100 Subject: [PATCH 9/9] Update composer.json --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 03d5664..5db9ef7 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "brossdu/symfony2-file-uploader-bundle", + "name": "punkave/symfony2-file-uploader-bundle", "type": "symfony-bundle", "description": "Multiple file uploads for Symfony2 with the BlueImp uploader. Also scales uploaded images", "keywords": ["upload", "file", "multiple file upload", "uploader", "blueimp", "symfony", "symfony bundle", "bundle", "punkave", "image transform", "symfony-2.0", "symfony-2.1"], @@ -25,9 +25,9 @@ "symfony/framework-bundle": "2.*" }, "autoload": { - "psr-0": { "Brossdu\\FileUploaderBundle": "" } + "psr-0": { "PunkAve\\FileUploaderBundle": "" } }, - "target-dir": "Brossdu/FileUploaderBundle", + "target-dir": "PunkAve/FileUploaderBundle", "minimum-stability": "dev", "extra": { "branch-alias": {