Skip to content
This repository was archived by the owner on Jan 24, 2019. It is now read-only.

Commit f5a6551

Browse files
committed
bugfix min
1 parent f18a9ff commit f5a6551

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

js.js

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
$js - asynchronous module definition framework
33
or just simple lightweight javascript dependencies manager
44
5-
@version 4.3
5+
@version 4.4
66
@link http://github.com/redcatphp/js/
77
@author Jo Surikat <jo@surikat.pro>
88
@website http://redcatphp.com
@@ -17,8 +17,8 @@
1717
};
1818
if(!Array.prototype.indexOf){
1919
Array.prototype.indexOf = function(a,obj, start){
20-
var j = a.length;
21-
for (var i = (start?start:0), j; i < j; i++)
20+
var ai = a.length;
21+
for (var i = (start?start:0), ai; i < ai; i++)
2222
if(a[i]===obj)
2323
return i;
2424
return -1;
@@ -302,7 +302,7 @@
302302
}
303303
}
304304
if(ok){
305-
js(dp,(function(){
305+
$js.exec(dp,(function(){
306306
var dpz = dp.toString();
307307
return function(){
308308
r(dpz,depTree,depMap,rio,arrSrc,c);
@@ -387,7 +387,7 @@
387387
u.push(getSrc(uo[k]));
388388
}
389389
u = u.sort().toString();
390-
js(s,function(){
390+
$js.exec(s,function(){
391391
requiredGroups[i].push(getSrc(s));
392392
if(requiredGroups[i].sort().toString()==u){
393393
if(typeof(c)=='function')
@@ -446,7 +446,7 @@
446446
}
447447
if(typeof(u[g])=='function')
448448
ev = 'u["'+g+'"]();'+ev;
449-
ev = 'js("'+g+'",function(){r("'+g+'",t,o,'+rio+',h,b);'+ev+'},false);';
449+
ev = '$js.exec("'+g+'",function(){r("'+g+'",t,o,'+rio+',h,b);'+ev+'},false);';
450450
}
451451
if(ev) eval(ev);
452452
};
@@ -481,7 +481,7 @@
481481
}
482482
if(typeof(u[d])=='function')
483483
ev = 'u["'+d+'"]();'+ev;
484-
ev = 'js("'+d+'",function(){'+ev+'});';
484+
ev = '$js.exec("'+d+'",function(){'+ev+'});';
485485
}
486486
}
487487
eval(ev);
@@ -499,7 +499,7 @@
499499
sync = sync?true:false;
500500
if(s instanceof Array){
501501
s.reverse();
502-
var ev = 'js(s'+(sync?',true':'')+',y);';
502+
var ev = '$js(s'+(sync?',true':'')+',y);';
503503
for(var i = 0; i < s.length; i++){
504504
ev = '$js.onExists("'+s[i]+'",function(){'+ev+'},n);';
505505
}
@@ -531,7 +531,7 @@
531531
if(httpRequest.readyState==4){
532532
if(httpRequest.status!=404){
533533
existsRegistry[s] = true;
534-
js(s,sync,y);
534+
$js(s,sync,y);
535535
}
536536
else{
537537
existsRegistry[s] = false;
@@ -542,7 +542,7 @@
542542
httpRequest.send();
543543
};
544544

545-
var js = function(){
545+
var exec = function(){
546546
//mixed args
547547
var u,c,sync,deps = true;
548548
for(var i = 0; i < arguments.length; i++){
@@ -593,19 +593,20 @@
593593
//chainable
594594
return function(){
595595
var a = arguments;
596-
return js(u,function(){
597-
js.apply(null,a);
596+
return $js.exec(u,function(){
597+
$js.apply(null,a);
598598
});
599599
};
600600
};
601-
$js = (function(j){
601+
$js = (function(exec){
602602

603603
//invoker
604604
var js = function(){
605605
if(typeof(arguments[0])=='string')
606606
arguments[0] = [arguments[0]];
607-
j.apply(null,arguments);
607+
exec.apply(null,arguments);
608608
};
609+
js.exec = exec;
609610

610611
//vars init
611612
js.dependenciesMap = {};
@@ -642,7 +643,7 @@
642643
}
643644
var interceptor = {};
644645
intercepting = interceptor;
645-
js(obj,sync,function(){
646+
$js(obj,sync,function(){
646647
if(!interceptor.callback){
647648
intercepting = false;
648649
}
@@ -685,7 +686,7 @@
685686
if(obj){
686687
var interceptor = {};
687688
intercepting = interceptor;
688-
var when = js(obj,sync,function(){
689+
var when = $js(obj,sync,function(){
689690
if(id){
690691
js.modules[getSrc(id)] = mod;
691692
delete(waitingModule[id]);
@@ -738,7 +739,7 @@
738739
}
739740
};
740741
js.invokeArray = function(mod,args){
741-
return js(mod,function(){
742+
return $js(mod,function(){
742743
$js.module(mod).apply(null,args);
743744
});
744745
};
@@ -754,7 +755,7 @@
754755
if(o.dependencies)
755756
$js.dependencies(o.dependencies);
756757
if(o.call)
757-
js(o.call);
758+
$js(o.call);
758759
};
759760
js.intercept = function(){
760761
var interceptor = {};
@@ -769,7 +770,7 @@
769770
};
770771
};
771772
return js;
772-
})(js);
773+
})(exec);
773774

774775
var y = {};
775776
var keysOf = function(o){

0 commit comments

Comments
 (0)