diff options
Diffstat (limited to 'src/js')
-rw-r--r-- | src/js/com.js | 17 | ||||
-rw-r--r-- | src/js/index.js | 7 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/js/com.js b/src/js/com.js index d19c8fd..204d51f 100644 --- a/src/js/com.js +++ b/src/js/com.js @@ -1166,15 +1166,24 @@ var com = new function(){ }); } - that.call_backend = function(path,func_name,callback){ + that.call_backend = function(path,func_name,timeout,callback){ var i; var params = new Array() - params = [that.backend_link + path,func_name,1000,callback] - for(i = 3;i < arguments.length;i++){ - params.push(arguments[i]); + if(typeof(timeout) == 'function'){ + callback = timeout + params = [that.backend_link + path,func_name,1000,callback] + for(i = 3;i < arguments.length;i++){ + params.push(arguments[i]); + } + }else{ + params = [that.backend_link + path,func_name,timeout,callback] + for(i = 4;i < arguments.length;i++){ + params.push(arguments[i]); + } } + imc.Proxy.instance.call.apply(undefined,params); }; that.sendfile_backend = function(blob,filekey_callback,result_callback){ diff --git a/src/js/index.js b/src/js/index.js index c18543a..e5c8f5f 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -114,7 +114,6 @@ var index = new function(){ user.datachg_callback.add(function(type){ var j_a; - var j_li; j_a = j_header.find('li.nickname > a'); j_a.text(user.nickname); @@ -127,9 +126,9 @@ var index = new function(){ j_header.find('li.nickname').show(); j_header.find('li.logout').show(); - j_li = j_menu.find('div.menu li.profile'); - j_li.find('a').attr('href','/toj/user:' + user.uid + '/main/'); - j_li.show(); + j_a = j_menu.find('div.menu a.profile'); + j_a.attr('href','/toj/user:' + user.uid + '/main/'); + j_a.show(); j_menu.find('div.menu a.mail').show(); j_menu.find('div.menu a.manage').show(); } |