diff --git a/public/main.js b/public/main.js deleted file mode 100644 index 89766fe..0000000 --- a/public/main.js +++ /dev/null @@ -1,14 +0,0 @@ -function initTwitterButton() { - !function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs'); -} - -jQuery(document).ready(function($) { - initTwitterButton(); - $('.proposals').on('mouseenter', '.proposal', function() { - twttr.widgets.load(); - $('.proposal .social').hide(); - $(this).find('.social').show("fast"); - }).on('mouseleave', '.proposal', function() { - $(this).find('.social').hide("fast"); - }); -}); diff --git a/public/proposals_list.js b/public/proposals_list.js new file mode 100644 index 0000000..0a3e28a --- /dev/null +++ b/public/proposals_list.js @@ -0,0 +1,31 @@ +function initTwitterButton() { + !function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs'); +} + +jQuery(document).ready(function($) { + initTwitterButton(); + $('.proposals').on('mouseenter', '.proposal', function() { + twttr.widgets.load(); + $('.proposal .social').hide(); + $(this).find('.social').show("fast"); + }).on('mouseleave', '.proposal', function() { + $(this).find('.social').hide("fast"); + }); + + function proposalsScroll() { + $('.proposals').data('jscroll', null); + $('.proposals').jscroll({ + loadingHtml: 'LoadingLoading...', + nextSelector: 'div.more a' + }); + $('.proposals').trigger('scroll.jscroll'); + } + proposalsScroll(); + + $('.proposals_list .filters a.order').on('ajax:success', function(event, data, status, xhr) { + $('.proposals_list .filters a.order').removeClass('selected'); + $(this).addClass('selected'); + $(this).parents('div.proposals_list').find('.proposals').html(data); + proposalsScroll(); + }); +}); diff --git a/views/content_viewer/_proposals_list.html.erb b/views/content_viewer/_proposals_list.html.erb index a205275..ba0a426 100644 --- a/views/content_viewer/_proposals_list.html.erb +++ b/views/content_viewer/_proposals_list.html.erb @@ -1,26 +1,5 @@ -<%= javascript_include_tag 'plugins/proposals_discussion/main.js' %> - - +<%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %> <% extend ProposalsDiscussionPlugin::ProposalsListHelper %> -- libgit2 0.21.2