bugfix

Author: devthejo

js.js

@@ -2,7 +2,7 @@
 	$js - asynchronous module definition framework
 			or just simple lightweight javascript dependencies manager
 	
-	@version 4.2
+	@version 4.3
 	@link http://github.com/redcatphp/js/
 	@author Jo Surikat <jo@surikat.pro>
 	@website http://redcatphp.com
@@ -189,7 +189,7 @@
 					}
 				}
 			}
-		}		
+		}
 		return deps;
 	};
 	var resolveDepCalls = function(u){
@@ -302,7 +302,7 @@
 					}
 				}
 				if(ok){
-					$js(dp,(function(){
+					js(dp,(function(){
 						var dpz = dp.toString();
 						return function(){
 							r(dpz,depTree,depMap,rio,arrSrc,c);
@@ -387,7 +387,7 @@
 			u.push(getSrc(uo[k]));
 		}
 		u = u.sort().toString();
-		$js(s,function(){
+		js(s,function(){
 			requiredGroups[i].push(getSrc(s));
 			if(requiredGroups[i].sort().toString()==u){
 				if(typeof(c)=='function')
@@ -396,6 +396,7 @@
 		},false,deps);
 	};
 	var asyncJsObject = function(u,c){
+		
 		requiredGroups.push([]);
 		var arr = resolveAsyncArr(u);
 		var deps = resolveDeps(u,arr);
@@ -445,9 +446,9 @@
 			}
 			if(typeof(u[g])=='function')
 				ev = 'u["'+g+'"]();'+ev;
-			ev = '$js("'+g+'",function(){r("'+g+'",t,o,'+rio+',h,b);'+ev+'},false);';
+			ev = 'js("'+g+'",function(){r("'+g+'",t,o,'+rio+',h,b);'+ev+'},false);';
 		}
-		eval(ev);
+		if(ev) eval(ev);
 	};
 	var syncJsObject = function(u,c){
 		var tops = depsToTops(resolveDeps(u));
@@ -480,7 +481,7 @@
 				}
 				if(typeof(u[d])=='function')
 					ev = 'u["'+d+'"]();'+ev;
-				ev = '$js("'+d+'",function(){'+ev+'});';
+				ev = 'js("'+d+'",function(){'+ev+'});';
 			}
 		}
 		eval(ev);
@@ -498,7 +499,7 @@
 		sync = sync?true:false;
 		if(s instanceof Array){
 			s.reverse();
-			var ev = '$js(s'+(sync?',true':'')+',y);';
+			var ev = 'js(s'+(sync?',true':'')+',y);';
 			for(var i = 0; i < s.length; i++){
 				ev = '$js.onExists("'+s[i]+'",function(){'+ev+'},n);';
 			}
@@ -530,7 +531,7 @@
 			if(httpRequest.readyState==4){
 				if(httpRequest.status!=404){
 					existsRegistry[s] = true;
-					$js(s,sync,y);
+					js(s,sync,y);
 				}
 				else{
 					existsRegistry[s] = false;
@@ -540,67 +541,70 @@
 		};
 		httpRequest.send();
 	};
-	$js = (function(){
+	
+	var js = function(){
+		//mixed args
+		var u,c,sync,deps = true;
+		for(var i = 0; i < arguments.length; i++){
+			switch(typeof(arguments[i])){
+				case 'boolean':
+					if(typeof(sync)=='undefined')
+						sync = arguments[i];
+					else
+						deps = arguments[i];
+				break;
+				case 'function':
+					c = arguments[i];
+				break;
+				case 'string':
+				case 'object':
+					u = arguments[i];
+				break;
+			}
+		}
+		if(typeof(sync)=='undefined')
+			sync = !$js.async;
 
-		//invoker
-		var js = function(){
-			//mixed args
-			var u,c,sync,deps = true;
-			for(var i = 0; i < arguments.length; i++){
-				switch(typeof(arguments[i])){
-					case 'boolean':
-						if(typeof(sync)=='undefined')
-							sync = arguments[i];
-						else
-							deps = arguments[i];
-					break;
-					case 'function':
-						c = arguments[i];
-					break;
-					case 'string':
-					case 'object':
-						u = arguments[i];
-					break;
-				}
+		//alias
+		u = resolveAlias(u);
+		
+		//handle
+		if(typeof(u)=='object'){
+			if(sync)
+				syncJsObject(u,c);
+			else
+				asyncJsObject(u,c);
+		}
+		else{
+			if(typeof(u)=='function'){
+				c = u;
+				u = 0;
 			}
-			if(typeof(sync)=='undefined')
-				sync = !$js.async;
-				
-			if(!windowLoaded&&typeof(u)=='string'&&!deps)
-				u = [u];
-			
-			//alias
-			u = resolveAlias(u);
-			
-			//handle
-			if(typeof(u)=='object'){
-				if(sync)
-					syncJsObject(u,c);
-				else
-					asyncJsObject(u,c);
+			if(deps&&typeof($js.dependenciesMap[u])!='undefined'){
+				asyncJsObject($js.dependenciesMap[u],function(){
+					apt(u,c,!sync);
+				});
 			}
 			else{
-				if(typeof(u)=='function'){
-					c = u;
-					u = 0;
-				}
-				if(deps&&typeof($js.dependenciesMap[u])!='undefined'){
-					asyncJsObject($js.dependenciesMap[u],function(){
-						$js(u,c,sync,false);
-					});
-				}
-				else{
-					apt(u,c,!sync);
-				}
+				apt(u,c,!sync);
 			}
-			
-			//chainable
-			return function(){
-				var a = arguments;
-				return $js(u,function(){
-					$js.apply(null,a);
-				});
-			};
+		}
+		
+		//chainable
+		return function(){
+			var a = arguments;
+			return js(u,function(){
+				js.apply(null,a);
+			});
+		};
+	};
+	$js = (function(j){
+		
+		//invoker
+		var js = function(){
+			if(typeof(arguments[0])=='string')
+				arguments[0] = [arguments[0]];
+			j.apply(null,arguments);
 		};
 
 		//vars init
@@ -638,7 +642,7 @@
 			}
 			var interceptor = {};
 			intercepting = interceptor;
-			$js(obj,sync,function(){
+			js(obj,sync,function(){
 				if(!interceptor.callback){
 					intercepting = false;
 				}
@@ -681,7 +685,7 @@
 				if(obj){
 					var interceptor = {};
 					intercepting = interceptor;
-					var when = $js(obj,sync,function(){
+					var when = js(obj,sync,function(){
 						if(id){
 							js.modules[getSrc(id)] = mod;
 							delete(waitingModule[id]);
@@ -734,7 +738,7 @@
 			}
 		};
 		js.invokeArray = function(mod,args){
-			return $js(mod,function(){
+			return js(mod,function(){
 				$js.module(mod).apply(null,args);
 			});
 		};
@@ -750,7 +754,7 @@
 			if(o.dependencies)
 				$js.dependencies(o.dependencies);
 			if(o.call)
-				$js(o.call);
+				js(o.call);
 		};
 		js.intercept = function(){
 			var interceptor = {};
@@ -765,7 +769,8 @@
 			};
 		};
 		return js;
-	})();
+	})(js);
+	
 	var y = {};
 	var keysOf = function(o){
 		var a = [];
@@ -825,7 +830,6 @@
 		}
 	}
 
-	var windowLoaded = false;
 	var loadAsync = function(k,s){
 		x(k,function(){
 			for(var i = 0; i < s.length; i++){
@@ -835,8 +839,7 @@
 		});
 	};
 	var y = {};
-	var load = function(){	
-		windowLoaded = true;
+	var load = function(){
 		apt = x;
 		for(var k in scripts[0]){
 			if(!scripts[0].hasOwnProperty(k)) continue;