Some small fixes

README.md

@@ -37,7 +37,6 @@ Screenshots
 -----------
 
 #![Screenshot 1](http://thebootle.com/foof/moo/DropZone/Demo/Screenshot%202011-12-18%20at%2021.24.png)
-http://d.pr/cQry
 
 Dependencies
 ------------

Source/DropZone/DropZone.Flash.js

@@ -21,7 +21,15 @@ provides: [DropZone.Flash]
 DropZone.Flash = new Class({
 
 	Extends: DropZone,
-
+
+	options: {
+
+		flash: {
+			movie: 'Moo.Uploader.swf'
+		}
+
+	},
+
 	initialize: function (options) {
 
 		this.setOptions(options);
@@ -34,6 +42,9 @@ DropZone.Flash = new Class({
 
 	activate: function () {
 
+		// set options
+		//this.setOptions(options);
+
 		this.parent();
 
 	},
@@ -126,9 +137,9 @@ DropZone.Flash = new Class({
 
 					// get the right file object
 					var file = this.fileList[r[0].id-1];
-										
+
 					var item,
-						perc = file.progress.percentLoaded;
+						perc = r[0].progress.percentLoaded;
 					if (this.uiList) item = this.uiList.getElement('#dropzone_item_' + file.uniqueid);
 
 					// set file progress

Source/DropZone/DropZone.HTML5.js

@@ -142,6 +142,7 @@ DropZone.HTML5 = new Class({
 
 				// Upload only checked and new files
 				if (file.checked && !file.uploading) {
+
 					this.isUploading = true;
 					file.uploading = true;
 					this.nCurrentUploads++;

Source/DropZone/DropZone.js

@@ -5,7 +5,7 @@ name: DropZone
 
 description: Crossbrowser file uploader with HTML5 chunk upload support, flexible UI and nice modability. Uploads are based on Mooupload by Juan Lago
 
-version: 0.9.1 (beta!)
+version: 0.9.1
 
 license: MIT-style license
 
@@ -55,9 +55,6 @@ var DropZone = new Class({
 		vars: { // additional to be sent to backend
 			'isDropZone': true // example..
 		},
-		flash: {
-			movie: 'Moo.Uploader.swf'
-		},
 		gravity_center: null, // an element after which hidden DropZone elements are output
 		// Events
 
@@ -129,8 +126,6 @@ var DropZone = new Class({
 			return new DropZone[this.method](options);
 
 		} else {
-
-			console.log('DropZone method is not available, please include the file: DropZone.' + this.method);
 
 		}
 
@@ -240,6 +235,8 @@ var DropZone = new Class({
 			this.nCurrentUploads--;
 		}
 
+		this.nCancelled++;
+
 		if(this.nCurrentUploads <= 0) this._queueComplete();
 
 		this.fireEvent('onItemCancel', [item]);
@@ -250,7 +247,13 @@ var DropZone = new Class({
 
 	kill: function(){
 
-		// 
+		// cancel all
+
+		this.fileList.each(function(f, i){
+
+			this.cancel(f.id);
+
+		}, this);
 
 	},
 
@@ -369,7 +372,7 @@ var DropZone = new Class({
 
 		this.queuePercent = perc / n_checked;
 
-		this.fireEvent('onUploadProgress', [this.queuePercent, this.nUploaded + this.nCurrentUploads, this.fileList.length]);
+		this.fireEvent('onUploadProgress', [this.queuePercent, this.nUploaded + this.nCurrentUploads, this.fileList.length-this.nCancelled]);
 
 	},
 
@@ -452,16 +455,19 @@ var DropZone = new Class({
 
 			// this approach works fine in Chrome
 
-
-
-			var img = new Element('img', {'style': 'display: none'});
+			var img = new Element('img'); //, {'style': 'display: none'}
 			img.addEvent('load', function(e) {
+
+				// job done
+				this.fireEvent('itemAdded', [item, file, img.src, img.getSize()]); // e.target.result for large images crashes Chrome?
+
 				window.URL.revokeObjectURL(img.src); // Clean up after yourself.
+
+				img.destroy();
+
 			}.bind(this));
-			img.src = window.URL.createObjectURL(file.file);
 
-			// job done
-			this.fireEvent('itemAdded', [item, file, img.src]); // e.target.result for large images crashes Chrome?
+			img.src = window.URL.createObjectURL(file.file);
 
 			// add the invisible picture to load
 			this.gravityCenter.adopt(img);
@@ -498,6 +504,7 @@ var DropZone = new Class({
 		this.nCurrentUploads = 0;
 		this.nUploaded = 0;
 		this.nErrors = 0;
+		this.nCancelled = 0;
 		this.queuePercent = 0;
 		this.isUploading = false;
 

package.yml

@@ -1,7 +1,7 @@
 name: DropZone
 author: bootle
 category: Utilities
-tags: [upload, html5, file, chunk, drag & drop, flash]
+tags: [upload, html5, chunk, drag & drop, flash]
 docs: https://github.com/bootle/DropZone
 demo: http://thebootle.com/foof/moo/DropZone/Demo/
 #current: 0.9.1