diff --git a/widgets/pollWidget/skins/default/js/poll.js b/widgets/pollWidget/skins/default/js/poll.js
index 632fe30c2..e41ed8b32 100644
--- a/widgets/pollWidget/skins/default/js/poll.js
+++ b/widgets/pollWidget/skins/default/js/poll.js
@@ -133,9 +133,16 @@ function deleteItem(poll_srl,poll_srl_indexes,poll_item_srl) {
return false;
}
-function loadPoll(poll_srl)
+function loadPoll(poll_srl,data)
{
- jQuery.exec_json("poll.getPollinfo", {"poll_srl":poll_srl}, function(data){
+ if(typeof data == 'undefined')
+ {
+ jQuery.exec_json("poll.getPollinfo", {"poll_srl":poll_srl}, function(data){
+ loadPoll(parseInt(data.poll.poll_srl),data);
+ });
+ }
+ else
+ {
jQuery("#stop_date_"+poll_srl).html(data.poll.stop_date);
initTemplete('poll');
@@ -164,7 +171,7 @@ function loadPoll(poll_srl)
jQuery("#poll_" + poll_srl + '_result').css({
display: "none"
});
- });
+ }
}
function showPollMemberNext(poll_srl,poll_item_srl)
@@ -254,17 +261,16 @@ function showPollMember(poll_srl,poll_item_srl)
return false;
}
-function loadPollResult(poll_srl)
+function loadPollResult(poll_srl,data)
{
- jQuery.exec_json("poll.getPollinfo", {"poll_srl":poll_srl}, function(data){
- /*
-
- {@$per = (int)(( $item->poll_count / $val->poll_count)*100) }
-
-
- {@$per = 0}
-
- */
+ if(typeof data == 'undefined')
+ {
+ jQuery.exec_json("poll.getPollinfo", {"poll_srl":poll_srl}, function(data){
+ loadPollResult(parseInt(data.poll.poll_srl),data);
+ });
+ }
+ else
+ {
jQuery("#stop_date_result_" + poll_srl).html(data.poll.stop_date);
jQuery("#poll_count_result_" + poll_srl).html(data.poll.poll_count);
@@ -311,13 +317,7 @@ function loadPollResult(poll_srl)
jQuery("#poll_" + poll_srl + '_result').css({
display: "block"
});
- /*
-
-
-
-
- */
- });
+ }
}
jQuery(function($){
@@ -401,4 +401,4 @@ jQuery(function($){
return false;
});
-});
\ No newline at end of file
+});
diff --git a/widgets/pollWidget/skins/default/js/poll.min.js b/widgets/pollWidget/skins/default/js/poll.min.js
deleted file mode 100644
index 46c02aee1..000000000
--- a/widgets/pollWidget/skins/default/js/poll.min.js
+++ /dev/null
@@ -1 +0,0 @@
-function initTemplete(e){switch(e){case"poll":if("undefined"==typeof window.template){var l=jQuery("#entry-template").html();window.template=Handlebars.compile(l)}break;case"result":if("undefined"==typeof window.template_result){var l=jQuery("#entry-template-result").html();window.template_result=Handlebars.compile(l)}break;case"members":if("undefined"==typeof window.template_member){var l=jQuery("#entry-template-members").html();window.template_member=Handlebars.compile(l)}}}function doPoll(e){for(var l=new Array,t=new Array,o=0;o-1){var n=r.split("_"),i=parseInt(n[1],10);l[i]=s.value,t[i]=new Array}else if(r.indexOf("item_")>-1){var n=r.split("_"),u=parseInt(n[1],10),i=parseInt(n[2],10);1==s.checked&&(t[i][t[i].length]=s.value)}}}var _="";for(var i in l)if(l.hasOwnProperty(i)){var a=l[i],p=t[i];if(p.length<1||a1,o.questions[r].additem=s}var i=t(o);jQuery("#poll_content_"+e).html(i),jQuery("#poll_"+e).css({display:"block"}),jQuery("#poll_"+e+"_result").css({display:"none"})})}function showPollMemberNext(e,l){return"undefined"==typeof window.cur_page&&(window.cur_page=1),window.cur_page++,jQuery.exec_json("poll.getPollitemInfo",{poll_srl:e,poll_item:l,page:window.cur_page},function(t){initTemplete("members");var o=window.template_member,s=Object;s.poll_srl=e,s.poll_item_srl=l,s.page=window.cur_page,s.isPage=t.page.total_count>5&&window.cur_page";s.poll_srl=e,s.poll_item_srl=l,s.page=window.cur_page,s.isPage=t.page.total_count>5&&window.cur_page",jQuery("#poll_content_"+e+"_result").html(n),jQuery("#poll_"+e+"_gotoresult_button").css({display:"table-row"}),jQuery("#poll_"+e+"_result_nobutton").css({display:"none"}),jQuery("#poll_"+e+"_result_yesbutton").css({display:"table-row"})}),!1}function loadPollResult(e){jQuery.exec_json("poll.getPollinfo",{poll_srl:e},function(l){jQuery("#stop_date_result_"+e).html(l.poll.stop_date),jQuery("#poll_count_result_"+e).html(l.poll.poll_count),initTemplete("result");var t=window.template_result,o=Object,s=1==l.poll.poll_type||3==l.poll.poll_type;o.questions={};for(var r in l.poll.poll){var n=l.poll.poll[r];o.questions[r]={},o.questions[r].poll_index_srl=n.poll_index_srl,o.questions[r].checkcount=n.checkcount,o.questions[r].title=n.title,o.questions[r].poll_count=n.poll_count,o.questions[r].showMembers=s,o.questions[r].items=n.item;var i=0;for(var u in n.item){var _=n.item[u];i++,n.poll_count>0?(o.questions[r].items[u].per=Math.round(_.poll_count/n.poll_count*100),o.questions[r].items[u].isVote=!0):(o.questions[r].items[u].per=0,o.questions[r].items[u].isVote=!1),o.questions[r].items[u].number=i}o.questions[r].items=n.item,o.questions[r].poll_srl=e,o.questions[r].isMultipleChoice=n.checkcount>1}var a=t(o);jQuery("#poll_content_"+e+"_result").html(a),jQuery("#poll_"+e).css({display:"none"}),jQuery("#poll_"+e+"_result").css({display:"block"})})}jQuery(function(e){e("._poll_result").click(function(){var l,t=e(this).attr("class");try{l=t.match(/\b_srl_(\d+)\b/)[1]}catch(o){}return l?(jQuery("#poll_"+l+"_result_button").css({display:"table-row"}),jQuery("#poll_"+l+"_result_nobutton").css({display:"none"}),jQuery("#poll_"+l+"_result_yesbutton").css({display:"table-row"}),loadPollResult(l),!1):!1}),e("._gotoresult_screen").click(function(){var l,t=e(this).attr("class");try{l=t.match(/\b_srl_(\d+)\b/)[1]}catch(o){}return l?(jQuery("#poll_"+l+"_gotoresult_button").css({display:"none"}),jQuery("#poll_"+l+"_result_nobutton").css({display:"table-row"}),jQuery("#poll_"+l+"_result_yesbutton").css({display:"none"}),loadPollResult(l),!1):!1}),e("._poll_screen").click(function(){var l,t=e(this).attr("class");try{l=t.match(/\b_srl_(\d+)\b/)[1]}catch(o){}return l?(jQuery("#poll_"+l+"_result_button").css({display:"none"}),jQuery("#poll_"+l+"_result_nobutton").css({display:"table-row"}),jQuery("#poll_"+l+"_result_yesbutton").css({display:"none"}),loadPoll(l),!1):!1})});
\ No newline at end of file
diff --git a/widgets/pollWidget/skins/default/pollview.html b/widgets/pollWidget/skins/default/pollview.html
index 04fccf6f9..91030848f 100644
--- a/widgets/pollWidget/skins/default/pollview.html
+++ b/widgets/pollWidget/skins/default/pollview.html
@@ -3,11 +3,11 @@
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.exec_json("poll.getPollstatus", {/**/"poll_srl":{$poll_srl}/**/}, function(data){/**/
- if(data.is_polled==0) loadPoll({$poll_srl});
+ jQuery.exec_json("poll.getPollinfo", {/**/"poll_srl":{$poll_srl}/**/}, function(data){/**/
+ if(data.poll.is_polled==0) loadPoll({$poll_srl},data);
else
{
- loadPollResult({$poll_srl});
+ loadPollResult({$poll_srl},data);
jQuery("#poll_{$poll_srl}_result_button").css({/**/
display: "none"
/**/});
@@ -202,4 +202,4 @@
-
\ No newline at end of file
+
diff --git a/widgets/pollWidget/skins/simple/js/poll.js b/widgets/pollWidget/skins/simple/js/poll.js
index 4cfb4f27c..74c5856c9 100644
--- a/widgets/pollWidget/skins/simple/js/poll.js
+++ b/widgets/pollWidget/skins/simple/js/poll.js
@@ -133,9 +133,16 @@ function deleteItem(poll_srl,poll_srl_indexes,poll_item_srl) {
return false;
}
-function loadPoll(poll_srl)
+function loadPoll(poll_srl,data)
{
- jQuery.exec_json("poll.getPollinfo", {"poll_srl":poll_srl}, function(data){
+ if(typeof data == 'undefined')
+ {
+ jQuery.exec_json("poll.getPollinfo", {"poll_srl":poll_srl}, function(data){
+ loadPoll(parseInt(data.poll.poll_srl),data);
+ });
+ }
+ else
+ {
jQuery("#stop_date_"+poll_srl).html(data.poll.stop_date);
initTemplete('poll');
@@ -164,7 +171,7 @@ function loadPoll(poll_srl)
jQuery("#poll_" + poll_srl + '_result').css({
display: "none"
});
- });
+ }
}
function showPollMemberNext(poll_srl,poll_item_srl)
@@ -254,17 +261,16 @@ function showPollMember(poll_srl,poll_item_srl)
return false;
}
-function loadPollResult(poll_srl)
+function loadPollResult(poll_srl,data)
{
- jQuery.exec_json("poll.getPollinfo", {"poll_srl":poll_srl}, function(data){
- /*
-
- {@$per = (int)(( $item->poll_count / $val->poll_count)*100) }
-
-
- {@$per = 0}
-
- */
+ if(typeof data == 'undefined')
+ {
+ jQuery.exec_json("poll.getPollinfo", {"poll_srl":poll_srl}, function(data){
+ loadPollResult(parseInt(data.poll.poll_srl),data);
+ });
+ }
+ else
+ {
jQuery("#stop_date_result_" + poll_srl).html(data.poll.stop_date);
jQuery("#poll_count_result_" + poll_srl).html(data.poll.poll_count);
@@ -311,13 +317,7 @@ function loadPollResult(poll_srl)
jQuery("#poll_" + poll_srl + '_result').css({
display: "block"
});
- /*
-
-
-
-
- */
- });
+ }
}
jQuery(function($){
@@ -401,4 +401,4 @@ jQuery(function($){
return false;
});
-});
\ No newline at end of file
+});
diff --git a/widgets/pollWidget/skins/simple/js/poll.min.js b/widgets/pollWidget/skins/simple/js/poll.min.js
deleted file mode 100644
index 2ed62a34f..000000000
--- a/widgets/pollWidget/skins/simple/js/poll.min.js
+++ /dev/null
@@ -1 +0,0 @@
-function initTemplete(e){switch(e){case"poll":if("undefined"==typeof window.template){var l=jQuery("#entry-template").html();window.template=Handlebars.compile(l)}break;case"result":if("undefined"==typeof window.template_result){var l=jQuery("#entry-template-result").html();window.template_result=Handlebars.compile(l)}break;case"members":if("undefined"==typeof window.template_member){var l=jQuery("#entry-template-members").html();window.template_member=Handlebars.compile(l)}}}function doPoll(e){for(var l=new Array,t=new Array,o=0;o-1){var n=r.split("_"),i=parseInt(n[1],10);l[i]=s.value,t[i]=new Array}else if(r.indexOf("item_")>-1){var n=r.split("_"),u=parseInt(n[1],10),i=parseInt(n[2],10);1==s.checked&&(t[i][t[i].length]=s.value)}}}var _="";for(var i in l)if(l.hasOwnProperty(i)){var a=l[i],p=t[i];if(p.length<1||a1,o.questions[r].additem=s}var i=t(o);jQuery("#poll_content_"+e).html(i),jQuery("#poll_"+e).css({display:"block"}),jQuery("#poll_"+e+"_result").css({display:"none"})})}function showPollMemberNext(e,l){return"undefined"==typeof window.cur_page&&(window.cur_page=1),window.cur_page++,jQuery.exec_json("poll.getPollitemInfo",{poll_srl:e,poll_item:l,page:window.cur_page},function(t){initTemplete("members");var o=window.template_member,s=Object;s.poll_srl=e,s.poll_item_srl=l,s.page=window.cur_page,s.isPage=t.page.total_count>5&&window.cur_page";s.poll_srl=e,s.poll_item_srl=l,s.page=window.cur_page,s.isPage=t.page.total_count>5&&window.cur_page",jQuery("#poll_content_"+e+"_result").html(n),jQuery("#poll_"+e+"_gotoresult_button").css({display:"table-row"}),jQuery("#poll_"+e+"_result_nobutton").css({display:"none"}),jQuery("#poll_"+e+"_result_yesbutton").css({display:"table-row"})}),!1}function loadPollResult(e){jQuery.exec_json("poll.getPollinfo",{poll_srl:e},function(l){jQuery("#stop_date_result_"+e).html(l.poll.stop_date),jQuery("#poll_count_result_"+e).html(l.poll.poll_count),initTemplete("result");var t=window.template_result,o=Object,s=1==l.poll.poll_type||3==l.poll.poll_type;o.questions={};for(var r in l.poll.poll){var n=l.poll.poll[r];o.questions[r]={},o.questions[r].poll_index_srl=n.poll_index_srl,o.questions[r].checkcount=n.checkcount,o.questions[r].title=n.title,o.questions[r].poll_count=n.poll_count,o.questions[r].showMembers=s,o.questions[r].items=n.item;var i=0;for(var u in n.item){var _=n.item[u];i++,n.poll_count>0?(o.questions[r].items[u].per=Math.round(_.poll_count/n.poll_count*100),o.questions[r].items[u].isVote=!0):(o.questions[r].items[u].per=0,o.questions[r].items[u].isVote=!1),o.questions[r].items[u].number=i}o.questions[r].items=n.item,o.questions[r].poll_srl=e,o.questions[r].isMultipleChoice=n.checkcount>1}var a=t(o);jQuery("#poll_content_"+e+"_result").html(a),jQuery("#poll_"+e).css({display:"none"}),jQuery("#poll_"+e+"_result").css({display:"block"})})}jQuery(function(e){e("._poll_result").click(function(){var l,t=e(this).attr("class");try{l=t.match(/\b_srl_(\d+)\b/)[1]}catch(o){}return l?(jQuery("#poll_"+l+"_result_button").css({display:"table-row"}),jQuery("#poll_"+l+"_result_nobutton").css({display:"none"}),jQuery("#poll_"+l+"_result_yesbutton").css({display:"table-row"}),loadPollResult(l),!1):!1}),e("._gotoresult_screen").click(function(){var l,t=e(this).attr("class");try{l=t.match(/\b_srl_(\d+)\b/)[1]}catch(o){}return l?(jQuery("#poll_"+l+"_gotoresult_button").css({display:"none"}),jQuery("#poll_"+l+"_result_nobutton").css({display:"table-row"}),jQuery("#poll_"+l+"_result_yesbutton").css({display:"none"}),loadPollResult(l),!1):!1}),e("._poll_screen").click(function(){var l,t=e(this).attr("class");try{l=t.match(/\b_srl_(\d+)\b/)[1]}catch(o){}return l?(jQuery("#poll_"+l+"_result_button").css({display:"none"}),jQuery("#poll_"+l+"_result_nobutton").css({display:"table-row"}),jQuery("#poll_"+l+"_result_yesbutton").css({display:"none"}),loadPoll(l),!1):!1})});
\ No newline at end of file
diff --git a/widgets/pollWidget/skins/simple/pollview.html b/widgets/pollWidget/skins/simple/pollview.html
index c3cb0f3f4..a605c5b4e 100644
--- a/widgets/pollWidget/skins/simple/pollview.html
+++ b/widgets/pollWidget/skins/simple/pollview.html
@@ -3,11 +3,11 @@
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.exec_json("poll.getPollstatus", {/**/"poll_srl":{$poll_srl}/**/}, function(data){/**/
- if(data.is_polled==0) loadPoll({$poll_srl});
+ jQuery.exec_json("poll.getPollinfo", {/**/"poll_srl":{$poll_srl}/**/}, function(data){/**/
+ if(data.poll.is_polled==0) loadPoll({$poll_srl},data);
else
{
- loadPollResult({$poll_srl});
+ loadPollResult({$poll_srl},data);
jQuery("#poll_{$poll_srl}_result_button").css({/**/
display: "none"
/**/});
@@ -145,4 +145,4 @@
-
\ No newline at end of file
+