Changeset - b8734b428786
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 10 years ago 2015-08-11 12:39:07
madski@unity3d.com
graphs: set initial canvas size to 0

The canvas will be set to the right size when the page has loaded. Until the
page has been loaded, Chrome has been seen to set the canvas to be so wide that
it would cover other visible links, thus preventing navigating away from the
page before it has been fully loaded.

This will make sure the canvas never takes up more space than intended.
3 files changed with 3 insertions and 3 deletions:
kallithea/templates/changelog/changelog.html
1
1
kallithea/templates/compare/compare_cs.html
1
1
kallithea/templates/pullrequests/pullrequest_show.html
1
1
0 comments (0 inline, 0 general)
kallithea/templates/changelog/changelog.html
➞
Show inline comments
 
@@ -50,49 +50,49 @@ ${self.repo_context_bar('changelog', c.f
 
                        <div style="float: right; margin: 0px 0px 0px 4px">
 
                            <a href="#" class="btn btn-small" id="rev_range_container" style="display:none"></a>
 
                            <a href="#" class="btn btn-small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
 
                            %if c.revision:
 
                                <a class="btn btn-small" href="${h.url('changelog_home', repo_name=c.repo_name)}">
 
                                    ${_('Go to tip of repository')}
 
                                </a>
 
                            %endif
 
                            %if c.db_repo.fork:
 
                                <a id="compare_fork"
 
                                   title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}"
 
                                   href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}"
 
                                   class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)}</a>
 
                            %endif
 
                            ## text and href of open_new_pr is controlled from javascript
 
                            <a id="open_new_pr" class="btn btn-small"></a>
 
                            ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)}
 
                        </div>
 
                    </div>
 
                </div>
 

			




	
	
	
		
 
                <div id="changelog" style="clear:both">

			




	
	
	
		
 

			




	
	
	
		
 
                <div id="graph_nodes">

			




	
	
	
		
 
                    <canvas id="graph_canvas"></canvas>

			




	
	
	
		
 
                    <canvas id="graph_canvas" style="width:0"></canvas>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div id="graph_content" style="${'margin: 0px' if c.changelog_for_path else ''}">

			




	
	
	
		
 

			




	
	
	
		
 
                <table id="changesets">

			




	
	
	
		
 
                <tbody>

			




	
	
	
		
 
                %for cnt,cs in enumerate(c.pagination):

			




	
	
	
		
 
                    <tr id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">

			




	
	
	
		
 
                        <td class="checkbox">

			




	
	
	
		
 
                            %if c.changelog_for_path:

			




	
	
	
		
 
                                ${h.checkbox(cs.raw_id,class_="changeset_range", disabled="disabled")}

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                                ${h.checkbox(cs.raw_id,class_="changeset_range")}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        <td class="status">

			




	
	
	
		
 
                          %if c.statuses.get(cs.raw_id):

			




	
	
	
		
 
                            <div class="changeset-status-ico">

			




	
	
	
		
 
                            %if c.statuses.get(cs.raw_id)[2]:

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">

			




	
	
	
		
 
                                <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                              </a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Changeset status: %s') % c.statuses.get(cs.raw_id)[1]}" href="${c.comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                                  <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                              </a>

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## Changesets table !

			




	
	
	
		
 
<div class="container">

			




	
	
	
		
 
  %if not c.cs_ranges:

			




	
	
	
		
 
    <span class="empty_data">${_('No changesets')}</span>

			




	
	
	
		
 
  %else:

			




	
	
	
		
 

			




	
	
	
		
 
    %if c.ancestor:

			




	
	
	
		
 
    <div class="ancestor">${_('Ancestor')}:

			




	
	
	
		
 
      ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 

			




	
	
	
		
 
    <div id="graph_nodes">

			




	
	
	
		
 
        <canvas id="graph_canvas"></canvas>

			




	
	
	
		
 
        <canvas id="graph_canvas" style="width:0"></canvas>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div id="graph_content_pr" style="margin-left: 100px;">

			




	
	
	
		
 

			




	
	
	
		
 
    <table class="compare_view_commits noborder">

			




	
	
	
		
 
    %for cnt, cs in enumerate(reversed(c.cs_ranges)):

			




	
	
	
		
 
        <tr id="chg_${cnt+1}">

			




	
	
	
		
 
        <td style="width:50px">

			




	
	
	
		
 
          %if cs.raw_id in c.statuses:

			




	
	
	
		
 
            <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">

			




	
	
	
		
 
                <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}"></i>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
          %if c.cs_comments.get(cs.raw_id):

			




	
	
	
		
 
              <div class="comments-container">

			




	
	
	
		
 
                  <div class="comments-cnt" title="${_('Changeset has comments')}">

			




	
	
	
		
 
                      <a href="${c.cs_comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                          ${len(c.cs_comments[cs.raw_id])}

			




	
	
	
		
 
                          <i class="icon-comment"></i>

			




	
	
	
		
 
                      </a>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </td>

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -152,49 +152,49 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Created by')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div class="author">

			




	
	
	
		
 
                  <div class="gravatar">

			




	
	
	
		
 
                    ${h.gravatar(c.pull_request.author.email, size=20)}

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
                  <span>${c.pull_request.author.full_name_and_username}</span><br/>

			




	
	
	
		
 
                  <span><a href="mailto:${c.pull_request.author.email}">${c.pull_request.author.email}</a></span><br/>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
            <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Update')}:</label>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="input">

			




	
	
	
		
 
              <div class="msg-div">${c.update_msg}</div>

			




	
	
	
		
 
              %if c.avail_revs:

			




	
	
	
		
 
              <div id="updaterevs" style="max-height:200px; overflow-y:auto; overflow-x:hidden; margin-bottom: 10px">

			




	
	
	
		
 
                <div style="height:0">

			




	
	
	
		
 
                  <canvas id="avail_graph_canvas"></canvas>

			




	
	
	
		
 
                  <canvas id="avail_graph_canvas" style="width:0"></canvas>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <table id="updaterevs-table" class="noborder" style="padding-left:50px">

			




	
	
	
		
 
                  %for cnt, cs in enumerate(c.avail_cs):

			




	
	
	
		
 
                    <tr id="chg_available_${cnt+1}">

			




	
	
	
		
 
                      %if cs.revision == c.cs_ranges[-1].revision:

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          %if editable:

			




	
	
	
		
 
                            ${h.radio(name='updaterev', value='')}

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td colspan="2">${_("Current revision - no change")}</td>

			




	
	
	
		
 
                      %else:

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          %if editable and cs.revision in c.avail_revs:

			




	
	
	
		
 
                            ${h.radio(name='updaterev', value=cs.raw_id)}

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>

			




	
	
	
		
 
                        <td><div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div></td>

			




	
	
	
		
 
                      %endif

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                </table>

			




	
	
	
		
 
              </div>

			




        

    



    


    



    



      

      





    
    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.