Skip to content
Snippets Groups Projects
Commit b6617e72 authored by mcmlxxix's avatar mcmlxxix
Browse files

remove "load" parameter/property from Bot_Module class to avoid overriding...

remove "load" parameter/property from Bot_Module class to avoid overriding load function in module scope. (pass load list to lib parameter instead)
parent 90275a01
No related branches found
No related tags found
No related merge requests found
...@@ -99,11 +99,17 @@ function init_servers(config) { ...@@ -99,11 +99,17 @@ function init_servers(config) {
var lib=new Array(); var lib=new Array();
if(lib_list) { if(lib_list) {
lib_list=lib_list.split(","); lib_list=lib_list.split(",");
for(var l in lib_list) lib.push(removeSpaces(lib_list[l])); for(var l in lib_list) {
lib.push(removeSpaces(lib_list[l]));
}
} }
var dir=backslash(config.iniGetValue(mysec,"dir"));
var load_list=directory(dir+"*.js"); var load_list=directory(dir+"*.js");
for(var l in load_list) {
lib.push(load_list[l]);
}
var dir=backslash(config.iniGetValue(mysec,"dir"));
var global=config.iniGetValue(mysec,"global"); var global=config.iniGetValue(mysec,"global");
var channels=parse_channel_list(config.iniGetValue(mysec, "channels")); var channels=parse_channel_list(config.iniGetValue(mysec, "channels"));
for(var c in channels) { for(var c in channels) {
...@@ -115,7 +121,6 @@ function init_servers(config) { ...@@ -115,7 +121,6 @@ function init_servers(config) {
Modules[module_name.toUpperCase()]=new Bot_Module( Modules[module_name.toUpperCase()]=new Bot_Module(
module_name, module_name,
dir, dir,
load_list,
global, global,
channels, channels,
lib lib
...@@ -179,9 +184,6 @@ function init_modules() { ...@@ -179,9 +184,6 @@ function init_modules() {
for(var l in Modules[m].lib) { for(var l in Modules[m].lib) {
if(Modules[m].lib[l]) load(Modules[m],Modules[m].lib[l]); if(Modules[m].lib[l]) load(Modules[m],Modules[m].lib[l]);
} }
for(var l in Modules[m].load) {
if(Modules[m].load[l]) load(Modules[m],Modules[m].load[l]);
}
} }
} }
...@@ -411,10 +413,9 @@ function Bot_IRC_Channel(name,key) { ...@@ -411,10 +413,9 @@ function Bot_IRC_Channel(name,key) {
// Functions. // Functions.
} }
function Bot_Module(name,dir,load,global,channels,lib) { function Bot_Module(name,dir,global,channels,lib) {
this.name=name; this.name=name;
this.dir=dir; this.dir=dir;
this.load=load;
this.global=global; this.global=global;
this.channels=channels; this.channels=channels;
this.lib=lib; this.lib=lib;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment