From 713c5bc445a0f8f671bdc297dfda9b2cca94bfaf Mon Sep 17 00:00:00 2001 From: MinSoo Kim Date: Mon, 25 Jan 2016 22:13:55 +0900 Subject: [PATCH] Follow the rule. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 코딩 규칙에 따라 스크립트 수정 --- widgets/pollWidget/skins/default/js/poll.js | 119 +++++++++--------- .../pollWidget/skins/default/pollview.html | 10 +- widgets/pollWidget/skins/simple/pollview.html | 2 +- 3 files changed, 68 insertions(+), 63 deletions(-) diff --git a/widgets/pollWidget/skins/default/js/poll.js b/widgets/pollWidget/skins/default/js/poll.js index 8416b1c08..c8baa9760 100644 --- a/widgets/pollWidget/skins/default/js/poll.js +++ b/widgets/pollWidget/skins/default/js/poll.js @@ -3,21 +3,21 @@ function initRxDefaultTemplete(type, poll_srl) switch(type) { case 'poll': - if(typeof window.template == 'undefined') + if (typeof window.template == 'undefined') { var source = jQuery("#entry-template-" + poll_srl).html(); window.template = Handlebars.compile(source); } break; case 'result': - if(typeof window.template_result == 'undefined') + if (typeof window.template_result == 'undefined') { var source = jQuery("#entry-template-result-" + poll_srl).html(); window.template_result = Handlebars.compile(source); } break; case 'members': - if(typeof window.template_member == 'undefined') + if (typeof window.template_member == 'undefined') { var source = jQuery("#entry-template-members-" + poll_srl).html(); window.template_member = Handlebars.compile(source); @@ -27,32 +27,37 @@ function initRxDefaultTemplete(type, poll_srl) } /* 설문 참여 함수 */ function doRxDefaultPoll(fo_obj) { - var checkcount = new Array(); var item = new Array(); - for(var i=0;i-1) { + if (name.indexOf('checkcount') > -1) { var t = name.split('_'); - var poll_srl_index = parseInt(t[1],10); + var poll_srl_index = parseInt(t[1], 10); checkcount[poll_srl_index] = obj.value; item[poll_srl_index] = new Array(); - } else if(name.indexOf('item_')>-1) { + } else if (name.indexOf('item_') > -1) { var t = name.split('_'); - var poll_srl = parseInt(t[1],10); - var poll_srl_index = parseInt(t[2],10); - if(obj.checked == true) item[poll_srl_index][item[poll_srl_index].length] = obj.value; + var poll_srl = parseInt(t[1], 10); + var poll_srl_index = parseInt(t[2], 10); + if (obj.checked == true) { + item[poll_srl_index][item[poll_srl_index].length] = obj.value; + } } } var poll_srl_indexes = ""; for(var poll_srl_index in checkcount) { - if(!checkcount.hasOwnProperty(poll_srl_index)) continue; + if(!checkcount.hasOwnProperty(poll_srl_index)) { + continue; + } var count = checkcount[poll_srl_index]; var items = item[poll_srl_index]; if(items.length < 1 || count < items.length) { @@ -65,9 +70,10 @@ function doRxDefaultPoll(fo_obj) { fo_obj.poll_srl_indexes.value = poll_srl_indexes; jQuery.exec_json("poll.procPoll", {"poll_srl":poll_srl,"poll_srl_indexes":poll_srl_indexes}, function(data){ - if(data.error!=0) alert(data.message); - else - { + if (data.error != 0) { + alert(data.message); + } + else { loadRxDefaultPollResult(poll_srl); jQuery("#poll_" + poll_srl + "_gotoresult_button").css({ display: "none" @@ -86,11 +92,12 @@ function doRxDefaultPoll(fo_obj) { } /* 항목 추가 함수 */ -function addRxDefaultItem(poll_srl,poll_srl_indexes) { - jQuery.exec_json("poll.procPollInsertItem", {"srl":poll_srl,"index_srl":poll_srl_indexes,"title":jQuery("#new_item_" + poll_srl_indexes).val()}, function(data){ - if(data.error!=0) alert(data.message); - else - { +function addRxDefaultItem(poll_srl, poll_srl_indexes) { + jQuery.exec_json("poll.procPollInsertItem", {"srl":poll_srl, "index_srl":poll_srl_indexes, "title":jQuery("#new_item_" + poll_srl_indexes).val()}, function(data){ + if (data.error!=0) { + alert(data.message); + } + else { jQuery("#poll_" + poll_srl + "_result_button").css({ display: "none" }); @@ -110,11 +117,12 @@ function addRxDefaultItem(poll_srl,poll_srl_indexes) { } /* 항목 삭제 함수 */ -function deleteRxDefaultItem(poll_srl,poll_srl_indexes,poll_item_srl) { - jQuery.exec_json("poll.procPollDeleteItem", {"srl":poll_srl,"index_srl":poll_srl_indexes,"item_srl":poll_item_srl}, function(data){ - if(data.error!=0) alert(data.message); - else - { +function deleteRxDefaultItem(poll_srl, poll_srl_indexes, poll_item_srl) { + jQuery.exec_json("poll.procPollDeleteItem", {"srl":poll_srl, "index_srl":poll_srl_indexes, "item_srl":poll_item_srl}, function(data){ + if (data.error!=0) { + alert(data.message); + } + else { jQuery("#poll_" + poll_srl + "_result_button").css({ display: "none" }); @@ -133,19 +141,17 @@ function deleteRxDefaultItem(poll_srl,poll_srl_indexes,poll_item_srl) { return false; } -function loadRxDefaultPoll(poll_srl,data) +function loadRxDefaultPoll(poll_srl, data) { - if(typeof data == 'undefined') - { + if (typeof data == 'undefined') { jQuery.exec_json("poll.getPollinfo", {"poll_srl":poll_srl}, function(data){ - loadRxDefaultPoll(parseInt(data.poll.poll_srl),data); + loadRxDefaultPoll(parseInt(data.poll.poll_srl), data); }); } - else - { + else { jQuery("#stop_date_"+poll_srl).html(data.poll.stop_date); - initRxDefaultTemplete('poll',poll_srl); + initRxDefaultTemplete('poll', poll_srl); var template = window.template; var context = Object; var additem = data.caniadditem; @@ -158,7 +164,7 @@ function loadRxDefaultPoll(poll_srl,data) context.questions[i].title = poll.title; context.questions[i].items = poll.item; context.questions[i].poll_srl = poll_srl; - context.questions[i].isMultipleChoice = (poll.checkcount>1); + context.questions[i].isMultipleChoice = (poll.checkcount > 1); context.questions[i].additem = additem; } var html = template(context); @@ -174,24 +180,23 @@ function loadRxDefaultPoll(poll_srl,data) } } -function showRxDefaultPollMemberNext(poll_srl,poll_item_srl) +function showRxDefaultPollMemberNext(poll_srl, poll_item_srl) { - if(typeof window.cur_page == 'undefined') - { + if (typeof window.cur_page == 'undefined') { window.cur_page = 1; } window.cur_page++; - jQuery.exec_json("poll.getPollitemInfo", {"poll_srl":poll_srl,"poll_item":poll_item_srl,"page":window.cur_page}, function(data){ - initRxDefaultTemplete('members',poll_srl); + jQuery.exec_json("poll.getPollitemInfo", {"poll_srl":poll_srl, "poll_item":poll_item_srl, "page":window.cur_page}, function(data){ + initRxDefaultTemplete('members', poll_srl); var template = window.template_member; var context = Object; context.poll_srl = poll_srl; context.poll_item_srl = poll_item_srl; context.page = window.cur_page; - context.isPage = ((data.page.total_count>5) && (window.cur_page 5) && (window.cur_page < data.page.total_page)); context.members = {}; @@ -213,21 +218,21 @@ function showRxDefaultPollMemberNext(poll_srl,poll_item_srl) return false; } -function showRxDefaultPollMember(poll_srl,poll_item_srl) +function showRxDefaultPollMember(poll_srl, poll_item_srl) { window.cur_page = 1; - jQuery.exec_json("poll.getPollitemInfo", {"poll_srl":poll_srl,"poll_item":poll_item_srl,"page":window.cur_page}, function(data){ - initRxDefaultTemplete('members',poll_srl); + jQuery.exec_json("poll.getPollitemInfo", {"poll_srl":poll_srl, "poll_item":poll_item_srl, "page":window.cur_page}, function(data){ + initRxDefaultTemplete('members', poll_srl); var template = window.template_member; var context = Object; var title = poll_member_lang; - title = title.replace("%s",data.item.title); + title = title.replace("%s", data.item.title); var html = '
' + title + '
    '; context.poll_srl = poll_srl; context.poll_item_srl = poll_item_srl; context.page = window.cur_page; - context.isPage = ((data.page.total_count>5) && (window.cur_page 5) && (window.cur_page < data.page.total_count)); context.members = {}; @@ -256,20 +261,18 @@ function showRxDefaultPollMember(poll_srl,poll_item_srl) return false; } -function loadRxDefaultPollResult(poll_srl,data) +function loadRxDefaultPollResult(poll_srl, data) { - if(typeof data == 'undefined') - { + if (typeof data == 'undefined') { jQuery.exec_json("poll.getPollinfo", {"poll_srl":poll_srl}, function(data){ - loadRxDefaultPollResult(parseInt(data.poll.poll_srl),data); + loadRxDefaultPollResult(parseInt(data.poll.poll_srl), data); }); } - else - { + else { jQuery("#stop_date_result_" + poll_srl).html(data.poll.stop_date); jQuery("#poll_count_result_" + poll_srl).html(data.poll.poll_count); - initRxDefaultTemplete('result',poll_srl); + initRxDefaultTemplete('result', poll_srl); var template = window.template_result; var context = Object; var showMembers = (data.poll.poll_type==1 || data.poll.poll_type==3); @@ -287,13 +290,11 @@ function loadRxDefaultPollResult(poll_srl,data) for (var j in poll.item) { var item = poll.item[j]; count++; - if(poll.poll_count>0) - { + if (poll.poll_count > 0) { context.questions[i].items[j].per = Math.round((item.poll_count / poll.poll_count)*100); context.questions[i].items[j].isVote = true; } - else - { + else { context.questions[i].items[j].per = 0; context.questions[i].items[j].isVote = false; } @@ -301,7 +302,7 @@ function loadRxDefaultPollResult(poll_srl,data) } context.questions[i].items = poll.item; context.questions[i].poll_srl = poll_srl; - context.questions[i].isMultipleChoice = (poll.checkcount>1); + context.questions[i].isMultipleChoice = (poll.checkcount > 1); } var html = template(context); @@ -319,12 +320,12 @@ function loadRxDefaultPollResult(poll_srl,data) }); // Check if the user have voted or not. If xe (he or she) have done, do not display back to the poll button - if(data.poll.is_polled==0){ + if (data.poll.is_polled == 0) { jQuery("#poll_" + poll_srl + '_result_button').css({ display: "block" }); } - else{ + else { jQuery("#poll_" + poll_srl + '_result_button').css({ display: "none" }); diff --git a/widgets/pollWidget/skins/default/pollview.html b/widgets/pollWidget/skins/default/pollview.html index 64fb38358..56323de13 100644 --- a/widgets/pollWidget/skins/default/pollview.html +++ b/widgets/pollWidget/skins/default/pollview.html @@ -3,10 +3,14 @@ var poll_alert_lang = "{$lang->msg_check_poll_item}"; var poll_checkcount_lang = "{$lang->poll_checkcount}"; var poll_member_lang = "{$lang->poll_item_members}"; - jQuery(document).ready(function(){ + jQuery(document).ready(function() { var data = {json_encode($poll_data)}; - if(data.poll.is_polled==0) loadRxDefaultPoll({$poll_srl},data); - else loadRxDefaultPollResult({$poll_srl},data); + if (data.poll.is_polled == 0) { + loadRxDefaultPoll({$poll_srl},data); + } + else { + loadRxDefaultPollResult({$poll_srl},data); + } });
    diff --git a/widgets/pollWidget/skins/simple/pollview.html b/widgets/pollWidget/skins/simple/pollview.html index 1d5face8d..ce577ce84 100644 --- a/widgets/pollWidget/skins/simple/pollview.html +++ b/widgets/pollWidget/skins/simple/pollview.html @@ -23,7 +23,7 @@ } }); -
    +