Merge pull request #48 from kraftner/issue/36

PR: Multi Uploader breaks when Upload fails

assets/src/logo/all.js

@@ -37,16 +37,18 @@
 					task        : 'fetch'
 				} )
 			)
-				.then(
-					// success
-					function( response ) {
-						//console.log( 'RESPONSE', self.attributes );
-					},
-					// error
-					function( reason ) {
-						//console.log( 'Model:fetch Error',reason );
-					}
-				);
+				.done( function( response ) {
+					self.set( {
+						thumb  : response.data.thumb,
+						name   : response.data.name,
+						width  : response.data.width,
+						height : response.data.height,
+						link   : response.data.link
+					} );
+				} )
+				.fail( function( reason ) {
+					//console.log( 'Model:fetch Error',reason );
+				} );
 
 			/*wp.ajax.post( plugin.action, {
 				_ajax_nonce : plugin._ajax_nonce,
@@ -69,7 +71,9 @@
 
 		// Triggered by: views.Delete
 		destroy : function( att_id ) {
+
 			var self = this;
+
 			$.when(
 				$.post( this.urlRoot, {
 					action      : plugin.action,
@@ -78,16 +82,13 @@
 					task        : 'destroy'
 				} )
 			)
-				.then(
-					// success
-					function( response ) {
-						//console.log( 'Model:destroy Success', response );
-					},
-					// error
-					function( reason ) {
-						//console.log( 'Model:destroy Error', reason );
-					}
-				);
+				.done( function( response ) {
+					// console.log( 'Model:destroy Success', response );
+				} )
+				.fail( function( reason ) {
+					// console.log( 'Model:destroy Error', reason );
+				} );
+
 			return {};
 		}
 	} );
@@ -260,9 +261,23 @@
 		// Bind event handler to file upload / drag&drop
 		uploader.bind( 'FileUploaded', function( up, file, response ) {
 
-			if ( 200 !== response.status ) {
-				return;
-			}
+            if ( 200 !== response.status ) {
+                return;
+            }
+
+            // Start C&P from handlers.js
+            // https://github.com/WordPress/WordPress/blob/32be6f7bb73b5c8e4bdd90179aa85b275606d982/wp-includes/js/plupload/handlers.js#L83-L87
+
+            var serverData = response.response;
+
+            // on success serverData should be numeric, fix bug in html4 runtime returning the serverData wrapped in a <pre> tag
+            serverData = serverData.replace(/^<pre>(\d+)<\/pre>$/, '$1');
+
+            // if async-upload returned an error message, place it in the media item div and return
+            if ( serverData.match(/media-upload-error|error-div/) ) {
+                return;
+            }
+            // End C&P from handlers.js
 
 			// Triggers Model:fetch( att_id ) & event listeners in the views
 			logo.set( { 'att_id' : response.response } );

assets/src/logo/controller.js

@@ -45,9 +45,23 @@
 		// Bind event handler to file upload / drag&drop
 		uploader.bind( 'FileUploaded', function( up, file, response ) {
 
-			if ( 200 !== response.status ) {
-				return;
-			}
+            if ( 200 !== response.status ) {
+                return;
+            }
+
+            // Start C&P from handlers.js
+            // https://github.com/WordPress/WordPress/blob/32be6f7bb73b5c8e4bdd90179aa85b275606d982/wp-includes/js/plupload/handlers.js#L83-L87
+
+            var serverData = response.response;
+
+            // on success serverData should be numeric, fix bug in html4 runtime returning the serverData wrapped in a <pre> tag
+            serverData = serverData.replace(/^<pre>(\d+)<\/pre>$/, '$1');
+
+            // if async-upload returned an error message, place it in the media item div and return
+            if ( serverData.match(/media-upload-error|error-div/) ) {
+                return;
+            }
+            // End C&P from handlers.js
 
 			// Triggers Model:fetch( att_id ) & event listeners in the views
 			logo.set( { 'att_id' : response.response } );