Fossil SCM

Use different format specifier for and textContent to avoid unwanted display issues.

andybradford 2013-12-05 08:36 hidden-tag
Commit 439f18e86609da646059891dec7d4423af498766
Parent 11e8a48e4d5cd90…
1 file changed +11 -11
~ src/info.c
M src/info.c
+11 -11
--- src/info.c
+++ src/info.c
@@ -2208,18 +2208,18 @@
22082208
 blob_zero(&comment);
22092209
 blob_append(&comment, zNewComment, -1);
22102210
 zUuid[10] = 0;
22112211
 style_header("Edit Check-in [%s]", zUuid);
22122212
 /*
2213
- ** Javascript functions to assist in modifying hidden branch options
2214
- ** sihbi: sets the innerHTML for the given element id to val
2213
+ ** Javascript functions to assist in modifying hidden branch options.
2214
+ ** stcbi: sets the textContent for the given element id to val
22152215
 ** hcbxbi: hids the checkbox and unchecks for the given element id
22162216
 ** hauc: hides and unchecks the checkbox when needed
22172217
 */
22182218
 @ <script>
2219
- @ function sihbi(id,val){
2220
- @ id.innerHTML = val;
2219
+ @ function stcbi(id,val){
2220
+ @ id.textContent = val;
22212221
 @ }
22222222
 @ function hcbxbi(id,toggle){
22232223
 @ if( toggle ){
22242224
 @ id.style.visibility = "hidden";
22252225
 @ id.checked = false;
@@ -2228,13 +2228,13 @@
22282228
 @ }
22292229
 @ }
22302230
 @ function hauc(cbxid,hidbrid,zdef,formid,toggle){
22312231
 @ if( cbxid ) hcbxbi(cbxid,toggle);
22322232
 @ if( toggle ){
2233
- @ sihbi(hidbrid,zdef);
2233
+ @ stcbi(hidbrid,zdef);
22342234
 @ }else{
2235
- @ if( gebi(formid).value ) sihbi(hidbrid,gebi(formid).value);
2235
+ @ if( gebi(formid).value ) stcbi(hidbrid,gebi(formid).value);
22362236
 @ }
22372237
 @ }
22382238
 @ </script>
22392239
 if( P("preview") ){
22402240
 Blob suffix;
@@ -2360,14 +2360,14 @@
23602360
 @ <tr><th align="right" valign="top">Branching:</th>
23612361
 @ <td valign="top">
23622362
 @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
23632363
 if( !fHasHidden && zBranchName ){
23642364
 if( fossil_strcmp(zBranchName, "trunk")==0 ){
2365
- @ onclick="hauc(gebi('hidebr'),gebi('hbranch'),'%s(zBranchName)',
2365
+ @ onclick="hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)',
23662366
 @ 'brname',this.value)"
23672367
 }else{
2368
- @ onclick="hauc(null,gebi('hbranch'),'%s(zBranchName)',
2368
+ @ onclick="hauc(null,gebi('hbranch'),'%h(zBranchName)',
23692369
 @ 'brname',this.value)"
23702370
 }
23712371
 }
23722372
 @ />
23732373
 @ Make this check-in the start of a new branch named:</label>
@@ -2374,14 +2374,14 @@
23742374
 @ <input type="text" style="width:15;" id="brname" name="brname"
23752375
 @ value="%h(zNewBranch)"
23762376
 if( !fHasHidden && zBranchName ){
23772377
 @ onkeyup="gebi('newbr').checked=!!this.value;
23782378
 if( fossil_strcmp(zBranchName, "trunk")==0 ){
2379
- @ hauc(gebi('hidebr'),gebi('hbranch'),'%s(zBranchName)',
2379
+ @ hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)',
23802380
 @ 'brname',!this.value)"
23812381
 }else{
2382
- @ hauc(null,gebi('hbranch'),'%s(zBranchName)','brname',!this.value)"
2382
+ @ hauc(null,gebi('hbranch'),'%h(zBranchName)','brname',!this.value)"
23832383
 }
23842384
 }
23852385
 @ />
23862386
 @ </td></tr>
23872387
@@ -2393,11 +2393,11 @@
23932393
 @ style="visibility: hidden" />
23942394
 }else{
23952395
 @ />
23962396
 }
23972397
 @ Hide branch
2398
- @ <span style="font-weight:bold" id="hbranch">%s(zBranchName)</span>
2398
+ @ <span style="font-weight:bold" id="hbranch">%h(zBranchName)</span>
23992399
 @ from the timeline starting from this check-in</label>
24002400
 @ </td></tr>
24012401
 }
24022402
24032403
24042404
--- src/info.c
+++ src/info.c
@@ -2208,18 +2208,18 @@
2208 blob_zero(&comment);
2209 blob_append(&comment, zNewComment, -1);
2210 zUuid[10] = 0;
2211 style_header("Edit Check-in [%s]", zUuid);
2212 /*
2213 ** Javascript functions to assist in modifying hidden branch options
2214 ** sihbi: sets the innerHTML for the given element id to val
2215 ** hcbxbi: hids the checkbox and unchecks for the given element id
2216 ** hauc: hides and unchecks the checkbox when needed
2217 */
2218 @ <script>
2219 @ function sihbi(id,val){
2220 @ id.innerHTML = val;
2221 @ }
2222 @ function hcbxbi(id,toggle){
2223 @ if( toggle ){
2224 @ id.style.visibility = "hidden";
2225 @ id.checked = false;
@@ -2228,13 +2228,13 @@
2228 @ }
2229 @ }
2230 @ function hauc(cbxid,hidbrid,zdef,formid,toggle){
2231 @ if( cbxid ) hcbxbi(cbxid,toggle);
2232 @ if( toggle ){
2233 @ sihbi(hidbrid,zdef);
2234 @ }else{
2235 @ if( gebi(formid).value ) sihbi(hidbrid,gebi(formid).value);
2236 @ }
2237 @ }
2238 @ </script>
2239 if( P("preview") ){
2240 Blob suffix;
@@ -2360,14 +2360,14 @@
2360 @ <tr><th align="right" valign="top">Branching:</th>
2361 @ <td valign="top">
2362 @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
2363 if( !fHasHidden && zBranchName ){
2364 if( fossil_strcmp(zBranchName, "trunk")==0 ){
2365 @ onclick="hauc(gebi('hidebr'),gebi('hbranch'),'%s(zBranchName)',
2366 @ 'brname',this.value)"
2367 }else{
2368 @ onclick="hauc(null,gebi('hbranch'),'%s(zBranchName)',
2369 @ 'brname',this.value)"
2370 }
2371 }
2372 @ />
2373 @ Make this check-in the start of a new branch named:</label>
@@ -2374,14 +2374,14 @@
2374 @ <input type="text" style="width:15;" id="brname" name="brname"
2375 @ value="%h(zNewBranch)"
2376 if( !fHasHidden && zBranchName ){
2377 @ onkeyup="gebi('newbr').checked=!!this.value;
2378 if( fossil_strcmp(zBranchName, "trunk")==0 ){
2379 @ hauc(gebi('hidebr'),gebi('hbranch'),'%s(zBranchName)',
2380 @ 'brname',!this.value)"
2381 }else{
2382 @ hauc(null,gebi('hbranch'),'%s(zBranchName)','brname',!this.value)"
2383 }
2384 }
2385 @ />
2386 @ </td></tr>
2387
@@ -2393,11 +2393,11 @@
2393 @ style="visibility: hidden" />
2394 }else{
2395 @ />
2396 }
2397 @ Hide branch
2398 @ <span style="font-weight:bold" id="hbranch">%s(zBranchName)</span>
2399 @ from the timeline starting from this check-in</label>
2400 @ </td></tr>
2401 }
2402
2403
2404
--- src/info.c
+++ src/info.c
@@ -2208,18 +2208,18 @@
2208 blob_zero(&comment);
2209 blob_append(&comment, zNewComment, -1);
2210 zUuid[10] = 0;
2211 style_header("Edit Check-in [%s]", zUuid);
2212 /*
2213 ** Javascript functions to assist in modifying hidden branch options.
2214 ** stcbi: sets the textContent for the given element id to val
2215 ** hcbxbi: hids the checkbox and unchecks for the given element id
2216 ** hauc: hides and unchecks the checkbox when needed
2217 */
2218 @ <script>
2219 @ function stcbi(id,val){
2220 @ id.textContent = val;
2221 @ }
2222 @ function hcbxbi(id,toggle){
2223 @ if( toggle ){
2224 @ id.style.visibility = "hidden";
2225 @ id.checked = false;
@@ -2228,13 +2228,13 @@
2228 @ }
2229 @ }
2230 @ function hauc(cbxid,hidbrid,zdef,formid,toggle){
2231 @ if( cbxid ) hcbxbi(cbxid,toggle);
2232 @ if( toggle ){
2233 @ stcbi(hidbrid,zdef);
2234 @ }else{
2235 @ if( gebi(formid).value ) stcbi(hidbrid,gebi(formid).value);
2236 @ }
2237 @ }
2238 @ </script>
2239 if( P("preview") ){
2240 Blob suffix;
@@ -2360,14 +2360,14 @@
2360 @ <tr><th align="right" valign="top">Branching:</th>
2361 @ <td valign="top">
2362 @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
2363 if( !fHasHidden && zBranchName ){
2364 if( fossil_strcmp(zBranchName, "trunk")==0 ){
2365 @ onclick="hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)',
2366 @ 'brname',this.value)"
2367 }else{
2368 @ onclick="hauc(null,gebi('hbranch'),'%h(zBranchName)',
2369 @ 'brname',this.value)"
2370 }
2371 }
2372 @ />
2373 @ Make this check-in the start of a new branch named:</label>
@@ -2374,14 +2374,14 @@
2374 @ <input type="text" style="width:15;" id="brname" name="brname"
2375 @ value="%h(zNewBranch)"
2376 if( !fHasHidden && zBranchName ){
2377 @ onkeyup="gebi('newbr').checked=!!this.value;
2378 if( fossil_strcmp(zBranchName, "trunk")==0 ){
2379 @ hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)',
2380 @ 'brname',!this.value)"
2381 }else{
2382 @ hauc(null,gebi('hbranch'),'%h(zBranchName)','brname',!this.value)"
2383 }
2384 }
2385 @ />
2386 @ </td></tr>
2387
@@ -2393,11 +2393,11 @@
2393 @ style="visibility: hidden" />
2394 }else{
2395 @ />
2396 }
2397 @ Hide branch
2398 @ <span style="font-weight:bold" id="hbranch">%h(zBranchName)</span>
2399 @ from the timeline starting from this check-in</label>
2400 @ </td></tr>
2401 }
2402
2403
2404

Keyboard Shortcuts

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