merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -55,50 +55,6 @@ function completeMovePoll(ret_obj, response_tags) {
winopen(url, 'pollTarget');
}
function getPollList()
{
var pollListTable = jQuery('#pollListTable');
var cartList = [];
pollListTable.find(':checkbox[name=cart]').each(function(){
if(this.checked) cartList.push(this.value);
});
var params = new Array();
var response_tags = ['error','message', 'poll_list'];
params["poll_srls"] = cartList.join(",");
exec_xml('poll','procPollGetList',params, completeGetPollList, response_tags);
}
function completeGetPollList(ret_obj, response_tags)
{
var htmlListBuffer = '';
if(ret_obj['poll_list'] == null)
{
htmlListBuffer = '<tr>' +
'<td colspan="3" style="text-align:center;">'+ret_obj['message']+'</td>' +
'</tr>';
}
else
{
var poll_list = ret_obj['poll_list']['item'];
if(!jQuery.isArray(poll_list)) poll_list = [poll_list];
for(var x in poll_list)
{
var objPoll = poll_list[x];
htmlListBuffer += '<tr>' +
'<td class="title">'+objPoll.title+'</td>' +
'<td class="nowr">'+objPoll.poll_count+'</td>' +
'<td class="nowr">'+objPoll.nick_name+'</td>' +
'</tr>' +
'<input type="hidden" name="cart[]" value="'+objPoll.poll_index_srl+'" />';
}
jQuery('#selectedPollCount').html(poll_list.length);
}
jQuery('#pollManageListTable>tbody').html(htmlListBuffer);
}
function checkSearch(form)
{
if(form.search_target.value == '')
@ -112,3 +68,24 @@ function checkSearch(form)
return false;
}
}
jQuery(function ($){
$('#pollList').submit(function(e){
var cnt = $('#pollList tbody :checked').length;
if(cnt == 0)
{
e.stopPropagation();
alert(xe.lang.msg_select_poll);
return false;
}
var msg = xe.lang.confirm_poll_delete.replace("%s", cnt);
if(!confirm(msg))
{
e.stopPropagation();
return false;
}
});
});

View file

@ -1,9 +1 @@
/**
* @file modules/poll/js/poll_admin.js
* @author NHN (developers@xpressengine.com)
* @brief poll 모듈의 관리자용 javascript
**/
function doDisplaySkinColorset(sel,colorset){var skin=sel.options[sel.selectedIndex].value,params=new Array();params.skin=skin;params.colorset=colorset;var response_tags=new Array("error","message","colorset_list");exec_xml("poll","getPollGetColorsetList",params,completeGetSkinColorset,response_tags,params)}
function completeGetSkinColorset(ret_obj,response_tags,params,fo_obj){var sel=get_by_id("fo_poll").poll_colorset,length=sel.options.length,selected_colorset=params.colorset;for(var i=0;i<length;i++)sel.remove(0);var colorset_list=ret_obj.colorset_list.split("\n"),selected_index=0;for(var i=0;i<colorset_list.length;i++){var tmp=colorset_list[i].split("|@|");if(selected_colorset&&selected_colorset==tmp[0])selected_index=i;var opt=new Option(tmp[1],tmp[0],false,false);sel.options.add(opt)};sel.selectedIndex=selected_index}
function doMovePoll(poll_srl,upload_target_srl){var params=new Array();params.poll_srl=poll_srl;params.upload_target_srl=upload_target_srl;var response_tags=new Array('error','message','document_srl','comment_srl');exec_xml('poll','getPollAdminTarget',params,completeMovePoll,response_tags)}
function completeMovePoll(ret_obj,response_tags){var document_srl=ret_obj.document_srl,comment_srl=ret_obj.comment_srl,url=request_uri.setQuery('document_srl',document_srl);if(comment_srl)url=url+'#comment_'+comment_srl;winopen(url,'pollTarget')}
function doDisplaySkinColorset(b,e){var c=b.options[b.selectedIndex].value;var d=new Array();d.skin=c;d.colorset=e;var a=new Array("error","message","colorset_list");exec_xml("poll","getPollGetColorsetList",d,completeGetSkinColorset,a,d);}function completeGetSkinColorset(g,a,f,e){var c=get_by_id("fo_poll").poll_colorset;var d=c.options.length;var l=f.colorset;for(var j=0;j<d;j++){c.remove(0);}var m=g.colorset_list.split("\n");var k=0;for(var j=0;j<m.length;j++){var h=m[j].split("|@|");if(l&&l==h[0]){k=j;}var b=new Option(h[1],h[0],false,false);c.options.add(b);}c.selectedIndex=k;}function doMovePoll(a,b){var d=new Array();d.poll_srl=a;d.upload_target_srl=b;var c=new Array("error","message","document_srl","comment_srl");exec_xml("poll","getPollAdminTarget",d,completeMovePoll,c);}function completeMovePoll(c,d){var e=c.document_srl;var a=c.comment_srl;var b=request_uri.setQuery("document_srl",e);if(a){b=b+"#comment_"+a;}winopen(b,"pollTarget");}function checkSearch(a){if(a.search_target.value==""){alert(xe.lang.msg_empty_search_target);return false;}if(a.search_keyword.value==""){alert(xe.lang.msg_empty_search_keyword);return false;}}jQuery(function(a){a("#pollList").submit(function(c){var b=a("#pollList tbody :checked").length;if(b==0){c.stopPropagation();alert(xe.lang.msg_select_poll);return false;}var d=xe.lang.confirm_poll_delete.replace("%s",b);if(!confirm(d)){c.stopPropagation();return false;}});});