fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 19:42:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug for displaying waiting message

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9292 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2011-09-23 02:41:22 +00:00
parent 611ba925a2
commit b738c8da36
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
common/js/xml_handler.js
View file

@ -312,10 +312,7 @@ $.exec_xml = window.exec_xml = function(module, act, params, callback_func, resp
// ajax 통신중 대기 메세지 출력 (show_waiting_message값을 false로 세팅시 보이지 않음) // ajax 통신중 대기 메세지 출력 (show_waiting_message값을 false로 세팅시 보이지 않음)
var waiting_obj = $('.wfsr'); var waiting_obj = $('.wfsr');
if(show_waiting_message && waiting_obj.length) { if(show_waiting_message && waiting_obj.length) {
var d = $(document); waiting_obj.html(waiting_message).show();
waiting_obj.html(waiting_message).css({
'display' : 'none'
});
} }
} }
function send_by_form(url, params) { function send_by_form(url, params) {
@ -359,10 +356,7 @@ $.exec_json = function(action,data,func){
if(typeof(data) == 'undefined') data = {}; if(typeof(data) == 'undefined') data = {};
action = action.split("."); action = action.split(".");
if(action.length == 2){ if(action.length == 2){
if(show_waiting_message) $(".wfsr").html(waiting_message).show();
if(show_waiting_message) {
$(".wfsr").html(waiting_message).css('display','none');
}
$.extend(data,{module:action[0],act:action[1]}); $.extend(data,{module:action[0],act:action[1]});
if(typeof(xeVid)!='undefined') $.extend(data,{vid:xeVid}); if(typeof(xeVid)!='undefined') $.extend(data,{vid:xeVid});
@ -373,7 +367,7 @@ $.exec_json = function(action,data,func){
,contentType:"application/json" ,contentType:"application/json"
,data:$.param(data) ,data:$.param(data)
,success : function(data){ ,success : function(data){
$(".wfsr").css('display','none'); $(".wfsr").hide();
if(data.error > 0) alert(data.message); if(data.error > 0) alert(data.message);
if($.isFunction(func)) func(data); if($.isFunction(func)) func(data);
} }
@ -388,9 +382,7 @@ $.fn.exec_html = function(action,data,type,func,args){
var self = $(this); var self = $(this);
action = action.split("."); action = action.split(".");
if(action.length == 2){ if(action.length == 2){
if(show_waiting_message) { if(show_waiting_message) $(".wfsr").html(waiting_message).show();
$(".wfsr").html(waiting_message).css('display','none');
}
$.extend(data,{module:action[0],act:action[1]}); $.extend(data,{module:action[0],act:action[1]});
$.ajax({ $.ajax({
@ -399,7 +391,7 @@ $.fn.exec_html = function(action,data,type,func,args){
,url:request_uri ,url:request_uri
,data:$.param(data) ,data:$.param(data)
,success : function(html){ ,success : function(html){
$(".wfsr").css('display','none'); $(".wfsr").hide();
self[type](html); self[type](html);
if($.isFunction(func)) func(args); if($.isFunction(func)) func(args);
} }