Small refactoring in handleStackObject()

addyosmani · Mar 14, 2012 · 2b95342 · 2b95342
1 parent 2a7e7d6
commit 2b95342
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/lib/basket.js b/lib/basket.js
@@ -52,29 +52,26 @@
 		key = storagePrefix + ( obj.key || obj.url ),
 		waitCount = globalWaitCount,
 		scriptIndex = scripts.length,
-		source = localStorage.getItem( key );
+		source = localStorage.getItem( key ),
+		callback = function( text ) {
+			scripts[ scriptIndex ] = text;
+			queueExec( waitCount, obj.execute );
+		};
 
 		if ( !obj.url ) {
 			return;
 		}
 
-		if ( obj.execute !== false ) {
+		obj.execute = obj.execute !== false;
-			obj.execute = true;
-		}
-
 		scripts[ scriptIndex ] = null;
 
 		if ( source ) {
-			scripts[ scriptIndex ] = source;
+			callback( source );
-			queueExec( waitCount, obj.execute );
 		} else {
-			saveUrl( obj.url, key, function( text ) {
+			saveUrl( obj.url, key, callback );
-				scripts[ scriptIndex ] = text;
-				queueExec( waitCount, obj.execute );
-			});
 		}
 
-		if ( obj.wait ) {
+		if ( isFunc(obj.wait) ) {
 			basket.wait( obj.wait );
 		}
 	},