Changeset - 5258b66bf5d7
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 9 years ago 2017-05-13 02:29:13
mads@kiilerich.com
pullrequests: fix "additional changes" js error - make sure all cs tables have a first column to align with (Issue #274)

A slight simplification of 16234f629cfb and fixing a JavaScript failure for
unauthenticated visits to PRs with pending available changesets.

nextFirstincell would be undefined becuase the "Current revision - no change"
line didn't have any elements in td, and nextFirstincell.offsetTop would thus
fail.

Fixed by adding a span around the text.

Also clarify that any element is fine - there is no need to check for
visibility.
2 files changed with 4 insertions and 3 deletions:
kallithea/public/js/graph.js
3
2
kallithea/templates/pullrequests/pullrequest_show.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/js/graph.js
➞
Show inline comments
 
@@ -67,98 +67,99 @@ function BranchRenderer(canvas_id, conte
 
		var canvasWidth = $(this.canvas).parent().width();
 

			




	
	
	
		
 
		this.canvas.setAttribute('width',canvasWidth);

			




	
	
	
		
 
		this.canvas.setAttribute('height',content.clientHeight);

			




	
	
	
		
 

			




	
	
	
		
 
		// HiDPI version needs to be scaled by 2x then halved via css

			




	
	
	
		
 
		// Note: Firefox on OS X fails scaling if the canvas height is more than 32k

			




	
	
	
		
 
		if (window.devicePixelRatio && content.clientHeight * window.devicePixelRatio < 32768) {

			




	
	
	
		
 
			this.canvas.setAttribute('width', canvasWidth * window.devicePixelRatio);

			




	
	
	
		
 
			this.canvas.setAttribute('height', content.clientHeight * window.devicePixelRatio);

			




	
	
	
		
 
			this.canvas.style.width = canvasWidth + "px";

			




	
	
	
		
 
			this.canvas.style.height = content.clientHeight + "px";

			




	
	
	
		
 
			this.ctx.scale(window.devicePixelRatio, window.devicePixelRatio);

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		var lineCount = 1;

			




	
	
	
		
 
		for (var i=0;i<data.length;i++) {

			




	
	
	
		
 
			var in_l = data[i][1];

			




	
	
	
		
 
			for (var j in in_l) {

			




	
	
	
		
 
				var m = in_l[j][0];

			




	
	
	
		
 
				if (m > lineCount)

			




	
	
	
		
 
					lineCount = m;

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		var edge_pad = this.dot_radius + 2;

			




	
	
	
		
 
		var box_size = Math.min(18, (canvasWidth - edge_pad * 2) / lineCount);

			




	
	
	
		
 
		var base_x = canvasWidth - edge_pad;

			




	
	
	
		
 

			




	
	
	
		
 
		for (var i=0; i < data.length; ++i) {

			




	
	
	
		
 
			var row = document.getElementById(row_id_prefix+idx);

			




	
	
	
		
 
			if (row == null) {

			




	
	
	
		
 
				console.log("error: row "+row_id_prefix+idx+" not found");

			




	
	
	
		
 
				continue;

			




	
	
	
		
 
			}

			




	
	
	
		
 
			var next = document.getElementById(row_id_prefix+(idx+1));

			




	
	
	
		
 
			var extra = 0;

			




	
	
	
		
 

			




	
	
	
		
 
			cur = data[i];

			




	
	
	
		
 
			node = cur[0];

			




	
	
	
		
 
			in_l = cur[1];

			




	
	
	
		
 
			closing = cur[2];

			




	
	
	
		
 
			obsolete_node = cur[3];

			




	
	
	
		
 
			bumped_node = cur[4];

			




	
	
	
		
 
			divergent_node = cur[5];

			




	
	
	
		
 
			extinct_node = cur[6];

			




	
	
	
		
 
			unstable_node = cur[7];

			




	
	
	
		
 

			




	
	
	
		
 
			var firstincell = $(row).find('td>:visible')[0];

			




	
	
	
		
 
			var nextFirstincell = $(next).find('td>:visible')[0];

			




	
	
	
		
 
			// center dots on the first element in a td (not necessarily the first one, but there must be one)

			




	
	
	
		
 
			var firstincell = $(row).find('td>*')[0];

			




	
	
	
		
 
			var nextFirstincell = $(next).find('td>*')[0];

			




	
	
	
		
 
			var rowY = Math.floor(row.offsetTop + firstincell.offsetTop + firstincell.offsetHeight/2);

			




	
	
	
		
 
			var nextY = Math.floor((next == null) ? rowY + row.offsetHeight/2 : next.offsetTop + nextFirstincell.offsetTop + nextFirstincell.offsetHeight/2);

			




	
	
	
		
 

			




	
	
	
		
 
			for (var j in in_l) {

			




	
	
	
		
 
				line = in_l[j];

			




	
	
	
		
 
				start = line[0];

			




	
	
	
		
 
				end = line[1];

			




	
	
	
		
 
				color = line[2];

			




	
	
	
		
 
				obsolete_line = line[3];

			




	
	
	
		
 

			




	
	
	
		
 
				x = Math.floor(base_x - box_size * start);

			




	
	
	
		
 

			




	
	
	
		
 
				// figure out if this is a dead-end;

			




	
	
	
		
 
				// we want to fade away this line

			




	
	
	
		
 
				var dead_end = true;

			




	
	
	
		
 
				if (next != null) {

			




	
	
	
		
 
					nextdata = data[i+1];

			




	
	
	
		
 
					next_l = nextdata[1];

			




	
	
	
		
 
					for (var k=0; k < next_l.length; ++k) {

			




	
	
	
		
 
						if (next_l[k][0] == end) {

			




	
	
	
		
 
							dead_end = false;

			




	
	
	
		
 
							break;

			




	
	
	
		
 
						}

			




	
	
	
		
 
					}

			




	
	
	
		
 
					if (nextdata[0][0] == end) // this is a root - not a dead end

			




	
	
	
		
 
						dead_end = false;

			




	
	
	
		
 
				}

			




	
	
	
		
 

			




	
	
	
		
 
				if (dead_end) {

			




	
	
	
		
 
					var gradient = this.ctx.createLinearGradient(x,rowY,x,nextY);

			




	
	
	
		
 
					gradient.addColorStop(0,this.calcColor(color, 0.0, 0.65));

			




	
	
	
		
 
					gradient.addColorStop(1,this.calcColor(color, 1.0, 0.0));

			




	
	
	
		
 
					this.ctx.strokeStyle = gradient;

			




	
	
	
		
 
					this.ctx.fillStyle = gradient;

			




	
	
	
		
 
				}

			




	
	
	
		
 
				// if this is a merge of differently

			




	
	
	
		
 
				// colored line, make it a gradient towards

			




	
	
	
		
 
				// the merged color

			




	
	
	
		
 
				else if (color != node[1] && start == node[0])

			




	
	
	
		
 
				{

			




	
	
	
		
 
					var gradient = this.ctx.createLinearGradient(x,rowY,x,nextY);

			




	
	
	
		
 
					gradient.addColorStop(0,this.calcColor(node[1], 0.0, 0.65));

			




	
	
	
		
 
					gradient.addColorStop(1,this.calcColor(color, 0.0, 0.65));

			




	
	
	
		
 
					this.ctx.strokeStyle = gradient;

			




	
	
	
		
 
					this.ctx.fillStyle = gradient;

			




	
	
	
		
 
				}

			




	
	
	
		
 
				else

			




	
	
	
		
 
				{

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -120,97 +120,97 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
               ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases?

			




	
	
	
		
 
               %if h.is_hg(c.pull_request.org_repo):

			




	
	
	
		
 
                 <span style="font-family: monospace">hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span>

			




	
	
	
		
 
               %elif h.is_git(c.pull_request.org_repo):

			




	
	
	
		
 
                 <span style="font-family: monospace">git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span>

			




	
	
	
		
 
               %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="form-group">

			




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

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
              <div>${h.fmt_date(c.pull_request.created_on)}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="form-group">

			




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

			




	
	
	
		
 
          <div class="pr-not-edit">

			




	
	
	
		
 
                  ${h.gravatar_div(c.pull_request.owner.email, size=20)}

			




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

			




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

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="pr-do-edit ac" style="display:none">

			




	
	
	
		
 
               ${h.text('owner', class_='form-control', value=c.pull_request.owner.username, placeholder=_('Username'))}

			




	
	
	
		
 
               <div id="owner_completion_container"></div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="form-group">

			




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

			




	
	
	
		
 
            <div>

			




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

			




	
	
	
		
 
              %if c.avail_revs:

			




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

			




	
	
	
		
 
                <div style="height:0;width:40px">

			




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

			




	
	
	
		
 
                </div>

			




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

			




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

			




	
	
	
		
 
                    <tr id="chg_available_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 and not (editable and cs.revision in c.avail_revs) else ''}">

			




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

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          %if editable:

			




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

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




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

			




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

			




	
	
	
		
 
                      %else:

			




	
	
	
		
 
                        <td>

			




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

			




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

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td style="width: 120px"><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

			




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

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          <div class="pull-right" style="margin-top: -4px;">

			




	
	
	
		
 
                            %for tag in cs.tags:

			




	
	
	
		
 
                              <span class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                                ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                              </span>

			




	
	
	
		
 
                            %endfor

			




	
	
	
		
 
                          </div>

			




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

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                      %endif

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                </table>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="msg-div">(${_("Pull request iterations do not change content once created. Select a revision and save to make a new iteration.")})</div>

			




	
	
	
		
 
              %endif

			




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

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        %if editable:

			




	
	
	
		
 
        <div class="form-group">

			




	
	
	
		
 
          <div class="buttons">

			




	
	
	
		
 
            ${h.submit('pr-form-save',_('Save Changes'),class_="btn btn-default btn-sm")}

			




	
	
	
		
 
            ${h.submit('pr-form-clone',_('Create New Iteration with Changes'),class_="btn btn-default btn-sm",disabled='disabled')}

			




	
	
	
		
 
            ${h.reset('pr-form-reset',_('Cancel Changes'),class_="btn btn-default btn-sm")}

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    ## REVIEWERS

			




	
	
	
		
 
    <div class="pull-left">

			




	
	
	
		
 
        <h4 class="pr-details-title">${_('Pull Request Reviewers')}</h4>

			




	
	
	
		
 
        <div id="reviewers" style="padding:0px 0px 5px 10px">

			




	
	
	
		
 
          ## members goes here !

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            %for member,status in c.pull_request_reviewers:

			




	
	
	
		
 
              <input type="hidden" value="${member.user_id}" name="org_review_members" />

			




	
	
	
		
 
            %endfor

			




        

    



    


    



    



      

      





    
    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.