Changeset - d5ec8035ff6e
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
domruf - 9 years ago 2017-05-25 19:49:50
dominikruf@gmail.com
changelog: re-render branch graph on page resize

When the browser size has been changed, the dots may no longer be correctly
aligned with the table rows. Currently, the graph will just overflow without
changing size, but that can soon change.
1 file changed with 10 insertions and 6 deletions:
kallithea/templates/changelog/changelog.html
10
6
0 comments (0 inline, 0 general)
kallithea/templates/changelog/changelog.html
➞
Show inline comments
 
@@ -161,48 +161,51 @@ ${self.repo_context_bar('changelog', c.f
 
                                    %endfor
 
                                    %if (not c.branch_name) and cs.branch:
 
                                        <span class="branchtag" title="${_('Branch %s' % cs.branch)}">
 
                                            ${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
 
                                        </span>
 
                                    %endif
 
                                </div>
 
                            </div>
 
                        </td>
 
                    </tr>
 
                %endfor
 
                </tbody>
 
                </table>
 

			




	
	
	
		
 
                <input type="checkbox" id="singlerange" style="display:none"/>

			




	
	
	
		
 

			




	
	
	
		
 
                </div>

			




	
	
	
		
 

			




	
	
	
		
 
                <ul class="pagination">

			




	
	
	
		
 
                    ${c.pagination.pager()}

			




	
	
	
		
 
                </ul>

			




	
	
	
		
 

			




	
	
	
		
 
        <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>

			




	
	
	
		
 
        <script type="text/javascript">

			




	
	
	
		
 
            var jsdata = ${h.js(c.jsdata)};

			




	
	
	
		
 
            var graph = new BranchRenderer('graph_canvas', 'graph_content', 'chg_');

			




	
	
	
		
 

			




	
	
	
		
 
            $(document).ready(function(){

			




	
	
	
		
 
                var $checkboxes = $('.changeset_range');

			




	
	
	
		
 

			




	
	
	
		
 
                pyroutes.register('changeset_home', ${h.js(h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s'))}, ['repo_name', 'revision']);

			




	
	
	
		
 

			




	
	
	
		
 
                var checkbox_checker = function(e) {

			




	
	
	
		
 
                    var $checked_checkboxes = $checkboxes.filter(':checked');

			




	
	
	
		
 
                    var $singlerange = $('#singlerange');

			




	
	
	
		
 

			




	
	
	
		
 
                    $('#rev_range_container').hide();

			




	
	
	
		
 
                    $checkboxes.show();

			




	
	
	
		
 
                    $singlerange.show();

			




	
	
	
		
 

			




	
	
	
		
 
                    if ($checked_checkboxes.length > 0) {

			




	
	
	
		
 
                        $checked_checkboxes.first().parent('td').append($singlerange);

			




	
	
	
		
 
                        var singlerange = $singlerange.prop('checked');

			




	
	
	
		
 
                        var rev_end = $checked_checkboxes.first().prop('name');

			




	
	
	
		
 
                        if ($checked_checkboxes.length > 1 || singlerange) {

			




	
	
	
		
 
                            var rev_start = $checked_checkboxes.last().prop('name');

			




	
	
	
		
 
                            $('#rev_range_container').prop('href',

			




	
	
	
		
 
                                pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},

			




	
	
	
		
 
                                                                'revision': rev_start + '...' + rev_end}));

			




	
	
	
		
 
                            $('#rev_range_container').html(

			




	
	
	
		
 
                                 _TM['Show Selected Changesets {0} &rarr; {1}'].format(rev_start.substr(0, 12), rev_end.substr(0, 12)));

			




	
	
		
 
@@ -243,87 +246,88 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                            if (!singlerange)

			




	
	
	
		
 
                                $singlerange.hide();

			




	
	
	
		
 
                        }

			




	
	
	
		
 
                    } else {

			




	
	
	
		
 
                        $('#singlerange').hide().prop('checked', false);

			




	
	
	
		
 
                        $('#rev_range_clear').hide();

			




	
	
	
		
 
                        %if c.revision:

			




	
	
	
		
 
                            $('#open_new_pr').prop('href', pyroutes.url('pullrequest_home',

			




	
	
	
		
 
                                                                        {'repo_name': ${h.js(c.repo_name)},

			




	
	
	
		
 
                                                                         'rev_end':${h.js(c.first_revision.raw_id)}}));

			




	
	
	
		
 
                            $('#open_new_pr').html(_TM['Open New Pull Request from {0}'].format(${h.jshtml(c.revision)}));

			




	
	
	
		
 
                        %else:

			




	
	
	
		
 
                            $('#open_new_pr').prop('href', pyroutes.url('pullrequest_home',

			




	
	
	
		
 
                                                                        {'repo_name': ${h.js(c.repo_name)},

			




	
	
	
		
 
                                                                        'branch':${h.js(c.first_revision.branch)}}));

			




	
	
	
		
 
                            $('#open_new_pr').html(_TM['Open New Pull Request from {0}'].format(${h.jshtml(c.first_revision.branch)}));

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                        $('#compare_fork').show();

			




	
	
	
		
 
                        $checkboxes.closest('tr').removeClass('out-of-range');

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                };

			




	
	
	
		
 
                checkbox_checker();

			




	
	
	
		
 
                $checkboxes.click(function() {

			




	
	
	
		
 
                    checkbox_checker();

			




	
	
	
		
 
                    r.render(jsdata);

			




	
	
	
		
 
                    graph.render(jsdata);

			




	
	
	
		
 
                });

			




	
	
	
		
 
                $('#singlerange').click(checkbox_checker);

			




	
	
	
		
 

			




	
	
	
		
 
                $('#rev_range_clear').click(function(e){

			




	
	
	
		
 
                    $checkboxes.prop('checked', false);

			




	
	
	
		
 
                    checkbox_checker();

			




	
	
	
		
 
                    r.render(jsdata);

			




	
	
	
		
 
                    graph.render(jsdata);

			




	
	
	
		
 
                });

			




	
	
	
		
 

			




	
	
	
		
 
                var $msgs = $('.message');

			




	
	
	
		
 
                // get first element height

			




	
	
	
		
 
                var el = $('#graph_content .container')[0];

			




	
	
	
		
 
                var row_h = el.clientHeight;

			




	
	
	
		
 
                $msgs.each(function() {

			




	
	
	
		
 
                    var m = this;

			




	
	
	
		
 

			




	
	
	
		
 
                    var h = m.clientHeight;

			




	
	
	
		
 
                    if(h > row_h){

			




	
	
	
		
 
                        var offset = row_h - (h+12);

			




	
	
	
		
 
                        $(m.nextElementSibling).css('display', 'block');

			




	
	
	
		
 
                        $(m.nextElementSibling).css('margin-top', offset+'px');

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                });

			




	
	
	
		
 

			




	
	
	
		
 
                $('.expand_commit').on('click',function(e){

			




	
	
	
		
 
                    var cid = $(this).data('commit_id');

			




	
	
	
		
 
                    $('#C-'+cid).toggleClass('expanded');

			




	
	
	
		
 

			




	
	
	
		
 
                    //redraw the graph, r and jsdata are bound outside function

			




	
	
	
		
 
                    r.render(jsdata);

			




	
	
	
		
 
                    graph.render(jsdata);

			




	
	
	
		
 
                });

			




	
	
	
		
 

			




	
	
	
		
 
                // change branch filter

			




	
	
	
		
 
                $("#branch_filter").select2({

			




	
	
	
		
 
                    dropdownAutoWidth: true,

			




	
	
	
		
 
                    maxResults: 50,

			




	
	
	
		
 
                    sortResults: branchSort

			




	
	
	
		
 
                    });

			




	
	
	
		
 

			




	
	
	
		
 
                $("#branch_filter").change(function(e){

			




	
	
	
		
 
                    var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;

			




	
	
	
		
 
                    if(selected_branch != ''){

			




	
	
	
		
 
                        window.location = pyroutes.url('changelog_home', {'repo_name': ${h.js(c.repo_name)},

			




	
	
	
		
 
                                                                          'branch': selected_branch});

			




	
	
	
		
 
                    }else{

			




	
	
	
		
 
                        window.location = pyroutes.url('changelog_home', {'repo_name': ${h.js(c.repo_name)}});

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                    $("#changelog").hide();

			




	
	
	
		
 
                });

			




	
	
	
		
 

			




	
	
	
		
 
                var jsdata = ${h.js(c.jsdata)};

			




	
	
	
		
 
                var r = new BranchRenderer('graph_canvas', 'graph_content', 'chg_');

			




	
	
	
		
 
                r.render(jsdata);

			




	
	
	
		
 
                graph.render(jsdata);

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
            $(window).resize(function(){

			




	
	
	
		
 
                graph.render(jsdata);

			




	
	
	
		
 
            });

			




	
	
	
		
 
        </script>

			




	
	
	
		
 
        %else:

			




	
	
	
		
 
            ${_('There are no changes yet')}

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.