Fossil SCM
Fix minor script problems. Actually turn on CSP.
Commit
e59a7fd3cfe7b9aef7b9ff908046779cc44f487642473ea9f0efaf640256e4bd
Parent
98fabd648dcea87…
3 files changed
+1
-1
+1
+2
-2
+1
-1
| --- src/graph.js | ||
| +++ src/graph.js | ||
| @@ -180,11 +180,11 @@ | ||
| 180 | 180 | var y0 = from.y + node.h/2; |
| 181 | 181 | var y1 = Math.ceil(to.y + node.h + arw.h/2); |
| 182 | 182 | drawLine(line,color,x,y0,null,y1); |
| 183 | 183 | x = to.x + (node.w-arw.w)/2; |
| 184 | 184 | var n = drawBox(arw.cls,null,x,y); |
| 185 | - n.style.borderBottomColor = color; | |
| 185 | + if(color) n.style.borderBottomColor = color; | |
| 186 | 186 | } |
| 187 | 187 | function drawMergeLine(x0,y0,x1,y1){ |
| 188 | 188 | drawLine(mLine,null,x0,y0,x1,y1); |
| 189 | 189 | } |
| 190 | 190 | function drawMergeArrow(p,rail){ |
| 191 | 191 |
| --- src/graph.js | |
| +++ src/graph.js | |
| @@ -180,11 +180,11 @@ | |
| 180 | var y0 = from.y + node.h/2; |
| 181 | var y1 = Math.ceil(to.y + node.h + arw.h/2); |
| 182 | drawLine(line,color,x,y0,null,y1); |
| 183 | x = to.x + (node.w-arw.w)/2; |
| 184 | var n = drawBox(arw.cls,null,x,y); |
| 185 | n.style.borderBottomColor = color; |
| 186 | } |
| 187 | function drawMergeLine(x0,y0,x1,y1){ |
| 188 | drawLine(mLine,null,x0,y0,x1,y1); |
| 189 | } |
| 190 | function drawMergeArrow(p,rail){ |
| 191 |
| --- src/graph.js | |
| +++ src/graph.js | |
| @@ -180,11 +180,11 @@ | |
| 180 | var y0 = from.y + node.h/2; |
| 181 | var y1 = Math.ceil(to.y + node.h + arw.h/2); |
| 182 | drawLine(line,color,x,y0,null,y1); |
| 183 | x = to.x + (node.w-arw.w)/2; |
| 184 | var n = drawBox(arw.cls,null,x,y); |
| 185 | if(color) n.style.borderBottomColor = color; |
| 186 | } |
| 187 | function drawMergeLine(x0,y0,x1,y1){ |
| 188 | drawLine(mLine,null,x0,y0,x1,y1); |
| 189 | } |
| 190 | function drawMergeArrow(p,rail){ |
| 191 |
+1
| --- src/sorttable.js | ||
| +++ src/sorttable.js | ||
| @@ -35,10 +35,11 @@ | ||
| 35 | 35 | function SortableTable(tableEl){ |
| 36 | 36 | var columnTypes = tableEl.getAttribute("data-column-types"); |
| 37 | 37 | var initSort = tableEl.getAttribute("data-init-sort"); |
| 38 | 38 | this.tbody = tableEl.getElementsByTagName('tbody'); |
| 39 | 39 | this.columnTypes = columnTypes; |
| 40 | + if(tableEl.rows.length==0) return; | |
| 40 | 41 | var ncols = tableEl.rows[0].cells.length; |
| 41 | 42 | for(var i = columnTypes.length; i<=ncols; i++){this.columnTypes += 't';} |
| 42 | 43 | this.sort = function (cell) { |
| 43 | 44 | var column = cell.cellIndex; |
| 44 | 45 | var sortFn; |
| 45 | 46 |
| --- src/sorttable.js | |
| +++ src/sorttable.js | |
| @@ -35,10 +35,11 @@ | |
| 35 | function SortableTable(tableEl){ |
| 36 | var columnTypes = tableEl.getAttribute("data-column-types"); |
| 37 | var initSort = tableEl.getAttribute("data-init-sort"); |
| 38 | this.tbody = tableEl.getElementsByTagName('tbody'); |
| 39 | this.columnTypes = columnTypes; |
| 40 | var ncols = tableEl.rows[0].cells.length; |
| 41 | for(var i = columnTypes.length; i<=ncols; i++){this.columnTypes += 't';} |
| 42 | this.sort = function (cell) { |
| 43 | var column = cell.cellIndex; |
| 44 | var sortFn; |
| 45 |
| --- src/sorttable.js | |
| +++ src/sorttable.js | |
| @@ -35,10 +35,11 @@ | |
| 35 | function SortableTable(tableEl){ |
| 36 | var columnTypes = tableEl.getAttribute("data-column-types"); |
| 37 | var initSort = tableEl.getAttribute("data-init-sort"); |
| 38 | this.tbody = tableEl.getElementsByTagName('tbody'); |
| 39 | this.columnTypes = columnTypes; |
| 40 | if(tableEl.rows.length==0) return; |
| 41 | var ncols = tableEl.rows[0].cells.length; |
| 42 | for(var i = columnTypes.length; i<=ncols; i++){this.columnTypes += 't';} |
| 43 | this.sort = function (cell) { |
| 44 | var column = cell.cellIndex; |
| 45 | var sortFn; |
| 46 |
+2
-2
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -371,12 +371,12 @@ | ||
| 371 | 371 | */ |
| 372 | 372 | static char zDfltHeader[] = |
| 373 | 373 | @ <html> |
| 374 | 374 | @ <head> |
| 375 | 375 | @ <base href="$baseurl/$current_page" /> |
| 376 | -@ <meta http-equiv="Content-Security-Policy-xxx" \ | |
| 377 | -@ content="default-src 'self' 'unsafe-inline'" /> | |
| 376 | +@ <meta http-equiv="Content-Security-Policy" \ | |
| 377 | +@ content="default-src 'self' data: 'unsafe-inline'" /> | |
| 378 | 378 | @ <title>$<project_name>: $<title></title> |
| 379 | 379 | @ <link rel="alternate" type="application/rss+xml" title="RSS Feed" \ |
| 380 | 380 | @ href="$home/timeline.rss" /> |
| 381 | 381 | @ <link rel="stylesheet" href="$stylesheet_url" type="text/css" \ |
| 382 | 382 | @ media="screen" /> |
| 383 | 383 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -371,12 +371,12 @@ | |
| 371 | */ |
| 372 | static char zDfltHeader[] = |
| 373 | @ <html> |
| 374 | @ <head> |
| 375 | @ <base href="$baseurl/$current_page" /> |
| 376 | @ <meta http-equiv="Content-Security-Policy-xxx" \ |
| 377 | @ content="default-src 'self' 'unsafe-inline'" /> |
| 378 | @ <title>$<project_name>: $<title></title> |
| 379 | @ <link rel="alternate" type="application/rss+xml" title="RSS Feed" \ |
| 380 | @ href="$home/timeline.rss" /> |
| 381 | @ <link rel="stylesheet" href="$stylesheet_url" type="text/css" \ |
| 382 | @ media="screen" /> |
| 383 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -371,12 +371,12 @@ | |
| 371 | */ |
| 372 | static char zDfltHeader[] = |
| 373 | @ <html> |
| 374 | @ <head> |
| 375 | @ <base href="$baseurl/$current_page" /> |
| 376 | @ <meta http-equiv="Content-Security-Policy" \ |
| 377 | @ content="default-src 'self' data: 'unsafe-inline'" /> |
| 378 | @ <title>$<project_name>: $<title></title> |
| 379 | @ <link rel="alternate" type="application/rss+xml" title="RSS Feed" \ |
| 380 | @ href="$home/timeline.rss" /> |
| 381 | @ <link rel="stylesheet" href="$stylesheet_url" type="text/css" \ |
| 382 | @ media="screen" /> |
| 383 |