Fossil SCM

More consistent naming scheme for IDs of copy buttons and their target elements.

florian 2019-06-05 07:16 trunk
Commit b19a9826082cf84cdcbaab6d50792c70cf7b8f1f423e61e0e5ff8739a2b6fdca
Parent 6908832cf4cf8bd…
3 files changed +1 -1 +11 -11 +1 -1
~ src/graph.js ~ src/info.c ~ src/tktsetup.c
M src/graph.js
+1 -1
--- src/graph.js
+++ src/graph.js
@@ -630,11 +630,11 @@
630630
 tooltipObj.style.color = s.getPropertyValue('color')
631631
 tooltipObj.style.visibility = "hidden"
632632
 tooltipObj.innerHTML = html
633633
 tooltipObj.appendChild(document.createTextNode(' '));
634634
 tooltipObj.appendChild(
635
- makeCopyButton("tooltip-copybtn","tooltip-link",0));
635
+ makeCopyButton("copy-tooltip-link","tooltip-link",0));
636636
 tooltipObj.style.display = "inline"
637637
 tooltipObj.style.position = "absolute"
638638
 var x = tooltipInfo.posX + 4 + window.pageXOffset
639639
 - absoluteX(tooltipObj.offsetParent)
640640
 tooltipObj.style.left = x+"px"
641641
--- src/graph.js
+++ src/graph.js
@@ -630,11 +630,11 @@
630 tooltipObj.style.color = s.getPropertyValue('color')
631 tooltipObj.style.visibility = "hidden"
632 tooltipObj.innerHTML = html
633 tooltipObj.appendChild(document.createTextNode(' '));
634 tooltipObj.appendChild(
635 makeCopyButton("tooltip-copybtn","tooltip-link",0));
636 tooltipObj.style.display = "inline"
637 tooltipObj.style.position = "absolute"
638 var x = tooltipInfo.posX + 4 + window.pageXOffset
639 - absoluteX(tooltipObj.offsetParent)
640 tooltipObj.style.left = x+"px"
641
--- src/graph.js
+++ src/graph.js
@@ -630,11 +630,11 @@
630 tooltipObj.style.color = s.getPropertyValue('color')
631 tooltipObj.style.visibility = "hidden"
632 tooltipObj.innerHTML = html
633 tooltipObj.appendChild(document.createTextNode(' '));
634 tooltipObj.appendChild(
635 makeCopyButton("copy-tooltip-link","tooltip-link",0));
636 tooltipObj.style.display = "inline"
637 tooltipObj.style.position = "absolute"
638 var x = tooltipInfo.posX + 4 + window.pageXOffset
639 - absoluteX(tooltipObj.offsetParent)
640 tooltipObj.style.left = x+"px"
641
M src/info.c
+11 -11
--- src/info.c
+++ src/info.c
@@ -763,14 +763,14 @@
763763
 " AND tag.tagid=tagxref.tagid "
764764
 " AND +tag.tagname GLOB 'sym-*'", rid);
765765
 while( db_step(&q2)==SQLITE_ROW ){
766766
 const char *zTagName = db_column_text(&q2, 0);
767767
 if( fossil_strcmp(zTagName,zBrName)==0 ){
768
- @ | <span class="copy-button" id="copy-br0"
769
- @ data-copytarget="br0" data-copylength="0">
770
- @ </span>&nbsp;<span
771
- @ id="br0">%z(href("%R/timeline?r=%T&unhide",zTagName))%h(zTagName)</a>
768
+ @ | <span class="copy-button" id="copy-name-br"
769
+ @ data-copytarget="name-br" data-copylength="0">
770
+ @ </span>&nbsp;<span id="name-br"><!--
771
+ @ -->%z(href("%R/timeline?r=%T&unhide",zTagName))%h(zTagName)</a>
772772
 @ </span>
773773
 if( wiki_tagid2("branch",zTagName)!=0 ){
774774
 blob_appendf(&wiki_read_links, " | %z%h</a>",
775775
 href("%R/wiki?name=branch/%h",zTagName), zTagName);
776776
 }else if( g.perm.Write && g.perm.WrWiki ){
@@ -798,13 +798,13 @@
798798
 @ | %z(href("%R/tree?nofiles&type=tree&ci=%!S",zUuid))folders</a>
799799
 @ </td>
800800
 @ </tr>
801801
802802
 @ <tr><th>%s(hname_alg(nUuid)):</th><td>
803
- @ <span class="copy-button" id="copy-fullhash"
804
- @ data-copytarget="fullhash" data-copylength="%d(hash_digits(1))">
805
- @ </span>&nbsp;<span id="fullhash">%.32s(zUuid)<wbr>%s(zUuid+32)</span>
803
+ @ <span class="copy-button" id="copy-hash-ci"
804
+ @ data-copytarget="hash-ci" data-copylength="%d(hash_digits(1))">
805
+ @ </span>&nbsp;<span id="hash-ci">%.32s(zUuid)<wbr>%s(zUuid+32)</span>
806806
 if( g.perm.Setup ){
807807
 @ (Record ID: %d(rid))
808808
 }
809809
 @ </td></tr>
810810
 @ <tr><th>User&nbsp;&amp;&nbsp;Date:</th><td>
@@ -2192,16 +2192,16 @@
21922192
 @ <h2>Latest version of file '%h(zName)':</h2>
21932193
 style_submenu_element("Artifact", "%R/artifact/%S", zUuid);
21942194
 }else{
21952195
 style_copy_button();
21962196
 @ <h2>Artifact
2197
- @ <span class="copy-button" id="copy-artifacthash"
2198
- @ data-copytarget="artifacthash" data-copylength="%d(hash_digits(1))">
2197
+ @ <span class="copy-button" id="copy-hash-ar"
2198
+ @ data-copytarget="hash-ar" data-copylength="%d(hash_digits(1))">
21992199
 if( g.perm.Setup ){
2200
- @ </span>&nbsp;<span id="artifacthash">%s(zUuid)</span> (%d(rid)):</h2>
2200
+ @ </span>&nbsp;<span id="hash-ar">%s(zUuid)</span> (%d(rid)):</h2>
22012201
 }else{
2202
- @ </span>&nbsp;<span id="artifacthash">%s(zUuid)</span>:</h2>
2202
+ @ </span>&nbsp;<span id="hash-ar">%s(zUuid)</span>:</h2>
22032203
 }
22042204
 }
22052205
 blob_zero(&downloadName);
22062206
 asText = P("txt")!=0;
22072207
 if( asText ) objdescFlags &= ~OBJDESC_BASE;
22082208
--- src/info.c
+++ src/info.c
@@ -763,14 +763,14 @@
763 " AND tag.tagid=tagxref.tagid "
764 " AND +tag.tagname GLOB 'sym-*'", rid);
765 while( db_step(&q2)==SQLITE_ROW ){
766 const char *zTagName = db_column_text(&q2, 0);
767 if( fossil_strcmp(zTagName,zBrName)==0 ){
768 @ | <span class="copy-button" id="copy-br0"
769 @ data-copytarget="br0" data-copylength="0">
770 @ </span>&nbsp;<span
771 @ id="br0">%z(href("%R/timeline?r=%T&unhide",zTagName))%h(zTagName)</a>
772 @ </span>
773 if( wiki_tagid2("branch",zTagName)!=0 ){
774 blob_appendf(&wiki_read_links, " | %z%h</a>",
775 href("%R/wiki?name=branch/%h",zTagName), zTagName);
776 }else if( g.perm.Write && g.perm.WrWiki ){
@@ -798,13 +798,13 @@
798 @ | %z(href("%R/tree?nofiles&type=tree&ci=%!S",zUuid))folders</a>
799 @ </td>
800 @ </tr>
801
802 @ <tr><th>%s(hname_alg(nUuid)):</th><td>
803 @ <span class="copy-button" id="copy-fullhash"
804 @ data-copytarget="fullhash" data-copylength="%d(hash_digits(1))">
805 @ </span>&nbsp;<span id="fullhash">%.32s(zUuid)<wbr>%s(zUuid+32)</span>
806 if( g.perm.Setup ){
807 @ (Record ID: %d(rid))
808 }
809 @ </td></tr>
810 @ <tr><th>User&nbsp;&amp;&nbsp;Date:</th><td>
@@ -2192,16 +2192,16 @@
2192 @ <h2>Latest version of file '%h(zName)':</h2>
2193 style_submenu_element("Artifact", "%R/artifact/%S", zUuid);
2194 }else{
2195 style_copy_button();
2196 @ <h2>Artifact
2197 @ <span class="copy-button" id="copy-artifacthash"
2198 @ data-copytarget="artifacthash" data-copylength="%d(hash_digits(1))">
2199 if( g.perm.Setup ){
2200 @ </span>&nbsp;<span id="artifacthash">%s(zUuid)</span> (%d(rid)):</h2>
2201 }else{
2202 @ </span>&nbsp;<span id="artifacthash">%s(zUuid)</span>:</h2>
2203 }
2204 }
2205 blob_zero(&downloadName);
2206 asText = P("txt")!=0;
2207 if( asText ) objdescFlags &= ~OBJDESC_BASE;
2208
--- src/info.c
+++ src/info.c
@@ -763,14 +763,14 @@
763 " AND tag.tagid=tagxref.tagid "
764 " AND +tag.tagname GLOB 'sym-*'", rid);
765 while( db_step(&q2)==SQLITE_ROW ){
766 const char *zTagName = db_column_text(&q2, 0);
767 if( fossil_strcmp(zTagName,zBrName)==0 ){
768 @ | <span class="copy-button" id="copy-name-br"
769 @ data-copytarget="name-br" data-copylength="0">
770 @ </span>&nbsp;<span id="name-br"><!--
771 @ -->%z(href("%R/timeline?r=%T&unhide",zTagName))%h(zTagName)</a>
772 @ </span>
773 if( wiki_tagid2("branch",zTagName)!=0 ){
774 blob_appendf(&wiki_read_links, " | %z%h</a>",
775 href("%R/wiki?name=branch/%h",zTagName), zTagName);
776 }else if( g.perm.Write && g.perm.WrWiki ){
@@ -798,13 +798,13 @@
798 @ | %z(href("%R/tree?nofiles&type=tree&ci=%!S",zUuid))folders</a>
799 @ </td>
800 @ </tr>
801
802 @ <tr><th>%s(hname_alg(nUuid)):</th><td>
803 @ <span class="copy-button" id="copy-hash-ci"
804 @ data-copytarget="hash-ci" data-copylength="%d(hash_digits(1))">
805 @ </span>&nbsp;<span id="hash-ci">%.32s(zUuid)<wbr>%s(zUuid+32)</span>
806 if( g.perm.Setup ){
807 @ (Record ID: %d(rid))
808 }
809 @ </td></tr>
810 @ <tr><th>User&nbsp;&amp;&nbsp;Date:</th><td>
@@ -2192,16 +2192,16 @@
2192 @ <h2>Latest version of file '%h(zName)':</h2>
2193 style_submenu_element("Artifact", "%R/artifact/%S", zUuid);
2194 }else{
2195 style_copy_button();
2196 @ <h2>Artifact
2197 @ <span class="copy-button" id="copy-hash-ar"
2198 @ data-copytarget="hash-ar" data-copylength="%d(hash_digits(1))">
2199 if( g.perm.Setup ){
2200 @ </span>&nbsp;<span id="hash-ar">%s(zUuid)</span> (%d(rid)):</h2>
2201 }else{
2202 @ </span>&nbsp;<span id="hash-ar">%s(zUuid)</span>:</h2>
2203 }
2204 }
2205 blob_zero(&downloadName);
2206 asText = P("txt")!=0;
2207 if( asText ) objdescFlags &= ~OBJDESC_BASE;
2208
M src/tktsetup.c
+1 -1
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -447,11 +447,11 @@
447447
 @ <table cellpadding="5">
448448
 @ <tr><td class="tktDspLabel">Ticket&nbsp;UUID:</td>
449449
 @ <th1>
450450
 @ if {[info exists tkt_uuid]} {
451451
 @ html "<td class='tktDspValue' colspan='3'>"
452
-@ copybtn tkt_uuid $tkt_uuid 1
452
+@ copybtn hash-tk $tkt_uuid 1
453453
 @ if {[hascap s]} {
454454
 @ html " ($tkt_id)"
455455
 @ }
456456
 @ html "</td></tr>\n"
457457
 @ } else {
458458
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -447,11 +447,11 @@
447 @ <table cellpadding="5">
448 @ <tr><td class="tktDspLabel">Ticket&nbsp;UUID:</td>
449 @ <th1>
450 @ if {[info exists tkt_uuid]} {
451 @ html "<td class='tktDspValue' colspan='3'>"
452 @ copybtn tkt_uuid $tkt_uuid 1
453 @ if {[hascap s]} {
454 @ html " ($tkt_id)"
455 @ }
456 @ html "</td></tr>\n"
457 @ } else {
458
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -447,11 +447,11 @@
447 @ <table cellpadding="5">
448 @ <tr><td class="tktDspLabel">Ticket&nbsp;UUID:</td>
449 @ <th1>
450 @ if {[info exists tkt_uuid]} {
451 @ html "<td class='tktDspValue' colspan='3'>"
452 @ copybtn hash-tk $tkt_uuid 1
453 @ if {[hascap s]} {
454 @ html " ($tkt_id)"
455 @ }
456 @ html "</td></tr>\n"
457 @ } else {
458

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button