Spec utils.clone, bugfix dont clone Blobs

Author: MrSwitch

demos/Collage/index.html

@@ -77,10 +77,10 @@ <h1>Hi, welcome to Collage</h1>
 // Register with Hello
 function loadImages(network){
 
-	hello.login(network, function(){
+	hello(network).login(function(){
 
 		// Does it have siblings?
-		hello.api(network+':me/albums', function(r){
+		hello(network).api('me/albums', function(r){
 
 			if(!r||r.error){
 				alert(r.error.message);
@@ -90,7 +90,7 @@ <h1>Hi, welcome to Collage</h1>
 			// Loop through and add photos to the canvas
 			for(var i=0;i<r.data.length;i++){
 
-				hello.api(network+':'+r.data[i].photos, function(r){
+				hello(network).api('me/album', {id : r.data[i].id}, function(r){
 
 					if(!r||r.error){
 						alert(r.error.message);

src/hello.js

@@ -1989,9 +1989,11 @@ hello.utils.extend( hello.utils, {
 	// Clone
 	// Create a clone of an object
 	clone : function(obj){
-		if("nodeName" in obj){
+		// Does not clone Dom elements, nor Binary data, e.g. Blobs, Filelists
+		if("nodeName" in obj || this.isBinary( obj ) ){
 			return obj;
 		}
+		// But does clone everything else.
 		var clone = {}, x;
 		for(x in obj){
 			if(typeof(obj[x]) === 'object'){
@@ -2478,17 +2480,21 @@ hello.utils.extend( hello.utils, {
 	// Some of the providers require that only MultiPart is used with non-binary forms.
 	// This function checks whether the form contains binary data
 	hasBinary : function (data){
-		var w = window;
 		for(var x in data ) if(data.hasOwnProperty(x)){
-			if( (this.domInstance('input', data[x]) && data[x].type === 'file')	||
-				("FileList" in w && data[x] instanceof w.FileList) ||
-				("File" in w && data[x] instanceof w.File) ||
-				("Blob" in w && data[x] instanceof w.Blob)
-			){
+			if( this.isBinary(data[x]) ){
 				return true;
 			}
 		}
 		return false;
+	},
+
+	isBinary : function(data){
+
+		return (this.domInstance('input', data) && data.type === 'file') ||
+				("FileList" in window && data instanceof window.FileList) ||
+				("File" in window && data instanceof window.File) ||
+				("Blob" in window && data instanceof window.Blob);
+
 	}
 });
 

tests/specs/index.html

@@ -33,6 +33,7 @@
 			require([
 				// UTILS
 				'./unit/utils/args',
+				'./unit/utils/clone',
 				'./unit/utils/dataToJSON',
 				'./unit/utils/diff',
 				'./unit/utils/domInstance',

tests/specs/unit/utils/clone.js

@@ -0,0 +1,60 @@
+define([
+//	'../../../../src/utils/dataToJSON'
+], function(
+//	dataToJSON
+){
+
+	var utils = hello.utils;
+
+	//
+	// Are errors thrown if an invalid network is provided
+	//
+	describe('utils / clone', function(){
+
+		it('should clone a simple object', function(){
+
+			var test = {
+				prop : 'prop'
+			};
+
+			var value = utils.clone(test);
+
+			// Assert that its the same but different.
+			expect( value ).to.be.eql( test ).and.not.to.be.equal( test );
+
+		});
+
+		it('should not clone Blob values', function(){
+
+			var blob = new Blob();
+
+			var test = {
+				prop : blob
+			};
+
+			var value = utils.clone(test);
+
+			// Assert that its the same but different.
+			expect( value.prop ).to.be.a( Blob ).and.to.be.equal( blob );
+
+		});
+
+		it('should not clone DOM element', function(){
+
+			var node = document.createElement('input');
+
+			var test = {
+				prop : node
+			};
+
+			var value = utils.clone(test);
+
+			// Assert that its the same but different.
+			expect( value.prop ).to.be.a( HTMLElement ).and.to.be.equal( node );
+
+		});
+
+	});
+
+
+});