Fossil SCM

Automatic scroll to the specific message of the thread when calling /info on a forum message.

drh 2018-07-26 01:33 forum-v2
Commit 8f0e18f4b0f4ebab2c512b1661bd791fc994ff8417c8c2f45d17a08f56d73e45
Parent 9757488a5dc0edc…
5 files changed +1 -1 +1 +24 +1 +1
~ src/forum.c ~ src/main.mk ~ src/style.c ~ win/Makefile.mingw ~ win/Makefile.msc
M src/forum.c
+1 -1
--- src/forum.c
+++ src/forum.c
@@ -463,11 +463,11 @@
463463
 if( g.perm.Debug ){
464464
 style_submenu_element("Chronological", "%R/forumthread/%s?t", zName);
465465
 }
466466
 fpid = forum_display_hierarchical(froot, fpid);
467467
 }
468
-
468
+ style_load_js("forum.js");
469469
 style_footer();
470470
 }
471471
472472
 /*
473473
 ** Return true if a forum post should be moderated.
474474
--- src/forum.c
+++ src/forum.c
@@ -463,11 +463,11 @@
463 if( g.perm.Debug ){
464 style_submenu_element("Chronological", "%R/forumthread/%s?t", zName);
465 }
466 fpid = forum_display_hierarchical(froot, fpid);
467 }
468
469 style_footer();
470 }
471
472 /*
473 ** Return true if a forum post should be moderated.
474
--- src/forum.c
+++ src/forum.c
@@ -463,11 +463,11 @@
463 if( g.perm.Debug ){
464 style_submenu_element("Chronological", "%R/forumthread/%s?t", zName);
465 }
466 fpid = forum_display_hierarchical(froot, fpid);
467 }
468 style_load_js("forum.js");
469 style_footer();
470 }
471
472 /*
473 ** Return true if a forum post should be moderated.
474
M src/main.mk
+1
--- src/main.mk
+++ src/main.mk
@@ -205,10 +205,11 @@
205205
 $(SRCDIR)/../skins/xekri/details.txt \
206206
 $(SRCDIR)/../skins/xekri/footer.txt \
207207
 $(SRCDIR)/../skins/xekri/header.txt \
208208
 $(SRCDIR)/ci_edit.js \
209209
 $(SRCDIR)/diff.tcl \
210
+ $(SRCDIR)/forum.js \
210211
 $(SRCDIR)/graph.js \
211212
 $(SRCDIR)/href.js \
212213
 $(SRCDIR)/login.js \
213214
 $(SRCDIR)/markdown.md \
214215
 $(SRCDIR)/menu.js \
215216
--- src/main.mk
+++ src/main.mk
@@ -205,10 +205,11 @@
205 $(SRCDIR)/../skins/xekri/details.txt \
206 $(SRCDIR)/../skins/xekri/footer.txt \
207 $(SRCDIR)/../skins/xekri/header.txt \
208 $(SRCDIR)/ci_edit.js \
209 $(SRCDIR)/diff.tcl \
 
210 $(SRCDIR)/graph.js \
211 $(SRCDIR)/href.js \
212 $(SRCDIR)/login.js \
213 $(SRCDIR)/markdown.md \
214 $(SRCDIR)/menu.js \
215
--- src/main.mk
+++ src/main.mk
@@ -205,10 +205,11 @@
205 $(SRCDIR)/../skins/xekri/details.txt \
206 $(SRCDIR)/../skins/xekri/footer.txt \
207 $(SRCDIR)/../skins/xekri/header.txt \
208 $(SRCDIR)/ci_edit.js \
209 $(SRCDIR)/diff.tcl \
210 $(SRCDIR)/forum.js \
211 $(SRCDIR)/graph.js \
212 $(SRCDIR)/href.js \
213 $(SRCDIR)/login.js \
214 $(SRCDIR)/markdown.md \
215 $(SRCDIR)/menu.js \
216
M src/style.c
+24
--- src/style.c
+++ src/style.c
@@ -507,15 +507,36 @@
507507
 ** Generate code to load a single javascript file
508508
 */
509509
 void style_load_one_js_file(const char *zFile){
510510
 @ <script src='%R/builtin/%s(zFile)?id=%S(MANIFEST_UUID)'></script>
511511
 }
512
+
513
+/*
514
+** All extra JS files to load.
515
+*/
516
+static const char *azJsToLoad[4];
517
+static int nJsToLoad = 0;
518
+
519
+/*
520
+** Register a new JS file to load at the end of the document.
521
+*/
522
+void style_load_js(const char *zName){
523
+ int i;
524
+ for(i=0; i<nJsToLoad; i++){
525
+ if( fossil_strcmp(zName, azJsToLoad[i])==0 ) return;
526
+ }
527
+ if( nJsToLoad>=sizeof(azJsToLoad)/sizeof(azJsToLoad[0]) ){
528
+ fossil_panic("too man JS files");
529
+ }
530
+ azJsToLoad[nJsToLoad++] = zName;
531
+}
512532
513533
 /*
514534
 ** Generate code to load all required javascript files.
515535
 */
516536
 static void style_load_all_js_files(void){
537
+ int i;
517538
 if( needHrefJs ){
518539
 int nDelay = db_get_int("auto-hyperlink-delay",0);
519540
 int bMouseover;
520541
 /* Load up the page data */
521542
 bMouseover = (!g.isHuman || db_get_boolean("auto-hyperlink-ishuman",0))
@@ -528,10 +549,13 @@
528549
 style_load_one_js_file("sorttable.js");
529550
 }
530551
 if( needGraphJs ){
531552
 style_load_one_js_file("graph.js");
532553
 }
554
+ for(i=0; i<nJsToLoad; i++){
555
+ style_load_one_js_file(azJsToLoad[i]);
556
+ }
533557
 }
534558
535559
 /*
536560
 ** Draw the footer at the bottom of the page.
537561
 */
538562
--- src/style.c
+++ src/style.c
@@ -507,15 +507,36 @@
507 ** Generate code to load a single javascript file
508 */
509 void style_load_one_js_file(const char *zFile){
510 @ <script src='%R/builtin/%s(zFile)?id=%S(MANIFEST_UUID)'></script>
511 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
512
513 /*
514 ** Generate code to load all required javascript files.
515 */
516 static void style_load_all_js_files(void){
 
517 if( needHrefJs ){
518 int nDelay = db_get_int("auto-hyperlink-delay",0);
519 int bMouseover;
520 /* Load up the page data */
521 bMouseover = (!g.isHuman || db_get_boolean("auto-hyperlink-ishuman",0))
@@ -528,10 +549,13 @@
528 style_load_one_js_file("sorttable.js");
529 }
530 if( needGraphJs ){
531 style_load_one_js_file("graph.js");
532 }
 
 
 
533 }
534
535 /*
536 ** Draw the footer at the bottom of the page.
537 */
538
--- src/style.c
+++ src/style.c
@@ -507,15 +507,36 @@
507 ** Generate code to load a single javascript file
508 */
509 void style_load_one_js_file(const char *zFile){
510 @ <script src='%R/builtin/%s(zFile)?id=%S(MANIFEST_UUID)'></script>
511 }
512
513 /*
514 ** All extra JS files to load.
515 */
516 static const char *azJsToLoad[4];
517 static int nJsToLoad = 0;
518
519 /*
520 ** Register a new JS file to load at the end of the document.
521 */
522 void style_load_js(const char *zName){
523 int i;
524 for(i=0; i<nJsToLoad; i++){
525 if( fossil_strcmp(zName, azJsToLoad[i])==0 ) return;
526 }
527 if( nJsToLoad>=sizeof(azJsToLoad)/sizeof(azJsToLoad[0]) ){
528 fossil_panic("too man JS files");
529 }
530 azJsToLoad[nJsToLoad++] = zName;
531 }
532
533 /*
534 ** Generate code to load all required javascript files.
535 */
536 static void style_load_all_js_files(void){
537 int i;
538 if( needHrefJs ){
539 int nDelay = db_get_int("auto-hyperlink-delay",0);
540 int bMouseover;
541 /* Load up the page data */
542 bMouseover = (!g.isHuman || db_get_boolean("auto-hyperlink-ishuman",0))
@@ -528,10 +549,13 @@
549 style_load_one_js_file("sorttable.js");
550 }
551 if( needGraphJs ){
552 style_load_one_js_file("graph.js");
553 }
554 for(i=0; i<nJsToLoad; i++){
555 style_load_one_js_file(azJsToLoad[i]);
556 }
557 }
558
559 /*
560 ** Draw the footer at the bottom of the page.
561 */
562
M win/Makefile.mingw
+1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -628,10 +628,11 @@
628628
 $(SRCDIR)/../skins/xekri/details.txt \
629629
 $(SRCDIR)/../skins/xekri/footer.txt \
630630
 $(SRCDIR)/../skins/xekri/header.txt \
631631
 $(SRCDIR)/ci_edit.js \
632632
 $(SRCDIR)/diff.tcl \
633
+ $(SRCDIR)/forum.js \
633634
 $(SRCDIR)/graph.js \
634635
 $(SRCDIR)/href.js \
635636
 $(SRCDIR)/login.js \
636637
 $(SRCDIR)/markdown.md \
637638
 $(SRCDIR)/menu.js \
638639
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -628,10 +628,11 @@
628 $(SRCDIR)/../skins/xekri/details.txt \
629 $(SRCDIR)/../skins/xekri/footer.txt \
630 $(SRCDIR)/../skins/xekri/header.txt \
631 $(SRCDIR)/ci_edit.js \
632 $(SRCDIR)/diff.tcl \
 
633 $(SRCDIR)/graph.js \
634 $(SRCDIR)/href.js \
635 $(SRCDIR)/login.js \
636 $(SRCDIR)/markdown.md \
637 $(SRCDIR)/menu.js \
638
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -628,10 +628,11 @@
628 $(SRCDIR)/../skins/xekri/details.txt \
629 $(SRCDIR)/../skins/xekri/footer.txt \
630 $(SRCDIR)/../skins/xekri/header.txt \
631 $(SRCDIR)/ci_edit.js \
632 $(SRCDIR)/diff.tcl \
633 $(SRCDIR)/forum.js \
634 $(SRCDIR)/graph.js \
635 $(SRCDIR)/href.js \
636 $(SRCDIR)/login.js \
637 $(SRCDIR)/markdown.md \
638 $(SRCDIR)/menu.js \
639
M win/Makefile.msc
+1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -569,10 +569,11 @@
569569
 $(SRCDIR)\../skins/xekri/details.txt \
570570
 $(SRCDIR)\../skins/xekri/footer.txt \
571571
 $(SRCDIR)\../skins/xekri/header.txt \
572572
 $(SRCDIR)\ci_edit.js \
573573
 $(SRCDIR)\diff.tcl \
574
+ $(SRCDIR)\forum.js \
574575
 $(SRCDIR)\graph.js \
575576
 $(SRCDIR)\href.js \
576577
 $(SRCDIR)\login.js \
577578
 $(SRCDIR)\markdown.md \
578579
 $(SRCDIR)\menu.js \
579580
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -569,10 +569,11 @@
569 $(SRCDIR)\../skins/xekri/details.txt \
570 $(SRCDIR)\../skins/xekri/footer.txt \
571 $(SRCDIR)\../skins/xekri/header.txt \
572 $(SRCDIR)\ci_edit.js \
573 $(SRCDIR)\diff.tcl \
 
574 $(SRCDIR)\graph.js \
575 $(SRCDIR)\href.js \
576 $(SRCDIR)\login.js \
577 $(SRCDIR)\markdown.md \
578 $(SRCDIR)\menu.js \
579
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -569,10 +569,11 @@
569 $(SRCDIR)\../skins/xekri/details.txt \
570 $(SRCDIR)\../skins/xekri/footer.txt \
571 $(SRCDIR)\../skins/xekri/header.txt \
572 $(SRCDIR)\ci_edit.js \
573 $(SRCDIR)\diff.tcl \
574 $(SRCDIR)\forum.js \
575 $(SRCDIR)\graph.js \
576 $(SRCDIR)\href.js \
577 $(SRCDIR)\login.js \
578 $(SRCDIR)\markdown.md \
579 $(SRCDIR)\menu.js \
580

Keyboard Shortcuts

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