kallithea Changeset - 48a96c4059df

Changeset - 48a96c4059df

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

domruf - 9 years ago 2016-09-21 21:29:23
dominikruf@gmail.com

js: set canvas width dynamically based on parent width

6 files changed with 13 insertions and 11 deletions:

kallithea/public/css/style.css

kallithea/public/js/graph.js

kallithea/templates/changelog/changelog.html

kallithea/templates/compare/compare_cs.html

kallithea/templates/pullrequests/pullrequest.html

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -2064,6 +2064,7 @@ BIN_FILENODE = 6 @@
 #graph_nodes {
     position: absolute;
     width: 100px;
+}
 #graph_content,

kallithea/public/js/graph.js

➞

Show inline comments

@@ @@ -32,7 +32,7 @@ function BranchRenderer(canvas_id, conte @@
 	if (!document.createElement("canvas").getContext)
 		this.canvas = window.G_vmlCanvasManager.initElement(this.canvas);
 	if (!this.canvas) { // canvas creation did for some reason fail - fail silently
-		this.render = function(data,canvasWidth) {};
 		this.render = function(data) {};
 		return;
+	}
 	this.ctx = this.canvas.getContext('2d');
@@ @@ -62,8 +62,9 @@ function BranchRenderer(canvas_id, conte @@
 		this.ctx.fillStyle = s;
+	}
-	this.render = function(data,canvasWidth) {
 	this.render = function(data) {
 		var idx = 1;
 		var canvasWidth = $(this.canvas).parent().width();
 		this.canvas.setAttribute('width',canvasWidth);
 		this.canvas.setAttribute('height',content.clientHeight);

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -272,14 +272,14 @@ ${self.repo_context_bar('changelog', c.f @@
                 checkbox_checker();
                 $checkboxes.click(function() {
                     checkbox_checker();
-                    r.render(jsdata,100);
                     r.render(jsdata);
                 });
                 $('#singlerange').click(checkbox_checker);
                 $('#rev_range_clear').click(function(e){
                     $checkboxes.prop('checked', false);
                     checkbox_checker();
-                    r.render(jsdata,100);
                     r.render(jsdata);
                 });
                 var $msgs = $('.message');
@@ @@ -302,7 +302,7 @@ ${self.repo_context_bar('changelog', c.f @@
                     $('#C-'+cid).toggleClass('expanded');
                     //redraw the graph, r and jsdata are bound outside function
-                    r.render(jsdata,100);
                     r.render(jsdata);
                 });
                 // change branch filter
@@ @@ -325,7 +325,7 @@ ${self.repo_context_bar('changelog', c.f @@
                 var jsdata = ${c.jsdata|n};
                 var r = new BranchRenderer('graph_canvas', 'graph_content', 'chg_');
-                r.render(jsdata,100);
                 r.render(jsdata);
             });
         </script>

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -127,13 +127,13 @@ @@
 %if not c.as_form:
         var jsdata = ${c.jsdata|n};
         var r = new BranchRenderer('graph_canvas', 'graph_content_pr', 'chg_');
-        r.render(jsdata,100);
         r.render(jsdata);
 %endif
         $('.expand_commit').click(function(e){
             var cid = $(this).attr('commit_id');
             $('#C-'+cid).toggleClass('expanded');
-            r.render(jsdata,100);
             r.render(jsdata);
         });
         $('.gravatar').click(function(e){

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -184,7 +184,7 @@ ${self.repo_context_bar('showpullrequest @@
           pendingajax = undefined;
           var jsdata = eval('('+$('#jsdata').html()+')'); // TODO: just get json
           var r = new BranchRenderer('graph_canvas', 'graph_content_pr', 'chg_');
-          r.render(jsdata,100);
           r.render(jsdata);
       });
+  }

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -154,7 +154,7 @@ ${self.repo_context_bar('showpullrequest @@
               <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; padding: 1px 0">
                 <div style="height:0">
+                <div style="height:0;width:40px">
                   <canvas id="avail_graph_canvas" style="width:0"></canvas>
                 </div>
                 <table id="updaterevs-table" class="noborder" style="padding-left:50px">
@@ @@ -373,7 +373,7 @@ ${self.repo_context_bar('showpullrequest @@
           var avail_jsdata = ${c.avail_jsdata|n};
           var avail_r = new BranchRenderer('avail_graph_canvas', 'updaterevs-table', 'chg_available_');
-          avail_r.render(avail_jsdata,40);
           avail_r.render(avail_jsdata);
           move_comments($(".comments .comments-list-chunk"));

0 comments (0 inline, 0 general)