Fossil SCM

Renamed fossil.pikchr-util.js to fossil.pikchr.js. Minor UI tweaks in the pikchr-related bits.

stephan 2020-09-14 10:48 trunk
Commit f5c040869d21927b3368952578cf44684d94f90ec3a675aa4e9484bc488e9e9e
Parent b74d1a3fd1fcf0c…
8 files changed +20 -5 +1 -1 +1 -1 +1 -1 +3 -2 +1 -1 +2 -2
~ src/builtin.c ~ src/default.css - src/fossil.pikchr-util.js ~ src/fossil.pikchr.js ~ src/main.mk ~ src/pikchrshow.c ~ win/Makefile.mingw ~ win/Makefile.msc
M src/builtin.c
+20 -5
--- src/builtin.c
+++ src/builtin.c
@@ -738,21 +738,36 @@
738738
 ** script URL than if they were not included. Thus, if a given page
739739
 ** has its own scripts to install via builtin_request_js(), they
740740
 ** should, if possible, be delayed until after this is called OR the
741741
 ** page should call builtin_fulfill_js_requests() to flush the request
742742
 ** queue before calling this routine.
743
+**
744
+** Example usage:
745
+**
746
+** if(!builtin_bundle_all_fossil_js_apis()){
747
+** builtin_emit_fossil_js_apis("dom", "fetch", 0);
748
+** }
749
+**
750
+** In bundled mode, that will emit all builtin fossil JS APIs, and in
751
+** non-bundled mode it will queue up the "dom" and "fetch" APIs to be
752
+** emitted the next time builtin_fulfill_js_requests() is called.
743753
 */
744754
 int builtin_bundle_all_fossil_js_apis(void){
745755
 static int bundled = 0;
746756
 if(JS_BUNDLED == builtin_get_js_delivery_mode()){
747757
 if(!bundled){
748758
 bundled = 1;
749
- builtin_emit_fossil_js_apis("dom", "fetch",
750
- "storage", "tabs",
751
- "confirmer", "popupwidget",
752
- "copybutton", "numbered-lines",
753
- 0);
759
+ builtin_emit_fossil_js_apis(
760
+ /* The order of the following arguments is important: any
761
+ which have dependencies must be listed after their
762
+ dependencies. ALL of them depend on the core
763
+ window.fossil bootstrapping bits. */
764
+ "dom", "fetch", "storage", "tabs",
765
+ "confirmer", "popupwidget",
766
+ "copybutton", "numbered-lines",
767
+ "pikchr",
768
+ 0);
754769
 builtin_fulfill_js_requests();
755770
 }
756771
 return 1;
757772
 }else{
758773
 return 0;
759774
--- src/builtin.c
+++ src/builtin.c
@@ -738,21 +738,36 @@
738 ** script URL than if they were not included. Thus, if a given page
739 ** has its own scripts to install via builtin_request_js(), they
740 ** should, if possible, be delayed until after this is called OR the
741 ** page should call builtin_fulfill_js_requests() to flush the request
742 ** queue before calling this routine.
 
 
 
 
 
 
 
 
 
 
743 */
744 int builtin_bundle_all_fossil_js_apis(void){
745 static int bundled = 0;
746 if(JS_BUNDLED == builtin_get_js_delivery_mode()){
747 if(!bundled){
748 bundled = 1;
749 builtin_emit_fossil_js_apis("dom", "fetch",
750 "storage", "tabs",
751 "confirmer", "popupwidget",
752 "copybutton", "numbered-lines",
753 0);
 
 
 
 
 
754 builtin_fulfill_js_requests();
755 }
756 return 1;
757 }else{
758 return 0;
759
--- src/builtin.c
+++ src/builtin.c
@@ -738,21 +738,36 @@
738 ** script URL than if they were not included. Thus, if a given page
739 ** has its own scripts to install via builtin_request_js(), they
740 ** should, if possible, be delayed until after this is called OR the
741 ** page should call builtin_fulfill_js_requests() to flush the request
742 ** queue before calling this routine.
743 **
744 ** Example usage:
745 **
746 ** if(!builtin_bundle_all_fossil_js_apis()){
747 ** builtin_emit_fossil_js_apis("dom", "fetch", 0);
748 ** }
749 **
750 ** In bundled mode, that will emit all builtin fossil JS APIs, and in
751 ** non-bundled mode it will queue up the "dom" and "fetch" APIs to be
752 ** emitted the next time builtin_fulfill_js_requests() is called.
753 */
754 int builtin_bundle_all_fossil_js_apis(void){
755 static int bundled = 0;
756 if(JS_BUNDLED == builtin_get_js_delivery_mode()){
757 if(!bundled){
758 bundled = 1;
759 builtin_emit_fossil_js_apis(
760 /* The order of the following arguments is important: any
761 which have dependencies must be listed after their
762 dependencies. ALL of them depend on the core
763 window.fossil bootstrapping bits. */
764 "dom", "fetch", "storage", "tabs",
765 "confirmer", "popupwidget",
766 "copybutton", "numbered-lines",
767 "pikchr",
768 0);
769 builtin_fulfill_js_requests();
770 }
771 return 1;
772 }else{
773 return 0;
774
M src/default.css
+1
--- src/default.css
+++ src/default.css
@@ -905,10 +905,11 @@
905905
 background-repeat: no-repeat;
906906
 background-position: center;
907907
 cursor: pointer;
908908
 }
909909
 .copy-button.disabled {
910
+ filter: grayscale(1);
910911
 opacity: 0.4;
911912
 }
912913
 .copy-button-flipped {
913914
 /*Note: .16em is suitable for element grouping.*/
914915
 margin-left: .16em;
915916
916917
DELETED src/fossil.pikchr-util.js
917918
ADDED src/fossil.pikchr.js
--- src/default.css
+++ src/default.css
@@ -905,10 +905,11 @@
905 background-repeat: no-repeat;
906 background-position: center;
907 cursor: pointer;
908 }
909 .copy-button.disabled {
 
910 opacity: 0.4;
911 }
912 .copy-button-flipped {
913 /*Note: .16em is suitable for element grouping.*/
914 margin-left: .16em;
915
916 ELETED src/fossil.pikchr-util.js
917 DDED src/fossil.pikchr.js
--- src/default.css
+++ src/default.css
@@ -905,10 +905,11 @@
905 background-repeat: no-repeat;
906 background-position: center;
907 cursor: pointer;
908 }
909 .copy-button.disabled {
910 filter: grayscale(1);
911 opacity: 0.4;
912 }
913 .copy-button-flipped {
914 /*Note: .16em is suitable for element grouping.*/
915 margin-left: .16em;
916
917 ELETED src/fossil.pikchr-util.js
918 DDED src/fossil.pikchr.js
D src/fossil.pikchr-util.js
-1
--- a/src/fossil.pikchr-util.js
+++ b/src/fossil.pikchr-util.js
@@ -1 +0,0 @@
1
-calc(-${wh} / 2)-${wh} / 2parentcalc(-${wh} / 2)-${wh} calc(-${whcalc(${wh} * 4 / 5 * -1)5 rgba(0,255,0,0.5);1K@F7,2r@Hb,O:calc(${wh} * 4 / 5 * -1)J@BW,V9@Kq,H:textarea(0,0,trueDH@pj,2mNnZM;
--- a/src/fossil.pikchr-util.js
+++ b/src/fossil.pikchr-util.js
@@ -1 +0,0 @@
1 calc(-${wh} / 2)-${wh} / 2parentcalc(-${wh} / 2)-${wh} calc(-${whcalc(${wh} * 4 / 5 * -1)5 rgba(0,255,0,0.5);1K@F7,2r@Hb,O:calc(${wh} * 4 / 5 * -1)J@BW,V9@Kq,H:textarea(0,0,trueDH@pj,2mNnZM;
--- a/src/fossil.pikchr-util.js
+++ b/src/fossil.pikchr-util.js
@@ -1 +0,0 @@
 
M src/fossil.pikchr.js
+1 -1
--- a/src/fossil.pikchr.js
+++ b/src/fossil.pikchr.js
@@ -1 +1 @@
1
-calc(-${wh} / 2)-${wh} / 2parentcalc(-${wh} / 2)-${wh} calc(-${whcalc(${wh} * 4 / 5 * -1)5 rgba(0,255,0,0.5);1K@F7,2r@Hb,O:calc(${wh} * 4 / 5 * -1)J@BW,V9@Kq,H:textarea(0,0,trueDH@pj,2mNnZM;
1
+calc(-${wh} / 2)-${wh} / 2parentcalc(-${wh} / 2)-${wh} calc(-${wh
--- a/src/fossil.pikchr.js
+++ b/src/fossil.pikchr.js
@@ -1 +1 @@
1 calc(-${wh} / 2)-${wh} / 2parentcalc(-${wh} / 2)-${wh} calc(-${whcalc(${wh} * 4 / 5 * -1)5 rgba(0,255,0,0.5);1K@F7,2r@Hb,O:calc(${wh} * 4 / 5 * -1)J@BW,V9@Kq,H:textarea(0,0,trueDH@pj,2mNnZM;
--- a/src/fossil.pikchr.js
+++ b/src/fossil.pikchr.js
@@ -1 +1 @@
1 calc(-${wh} / 2)-${wh} / 2parentcalc(-${wh} / 2)-${wh} calc(-${wh
M src/main.mk
+1 -1
--- src/main.mk
+++ src/main.mk
@@ -235,11 +235,11 @@
235235
 $(SRCDIR)/fossil.page.fileedit.js \
236236
 $(SRCDIR)/fossil.page.forumpost.js \
237237
 $(SRCDIR)/fossil.page.pikchrshow.js \
238238
 $(SRCDIR)/fossil.page.wikiedit-wysiwyg-legacy.js \
239239
 $(SRCDIR)/fossil.page.wikiedit.js \
240
- $(SRCDIR)/fossil.pikchr-util.js \
240
+ $(SRCDIR)/fossil.pikchr.js \
241241
 $(SRCDIR)/fossil.popupwidget.js \
242242
 $(SRCDIR)/fossil.storage.js \
243243
 $(SRCDIR)/fossil.tabs.js \
244244
 $(SRCDIR)/graph.js \
245245
 $(SRCDIR)/href.js \
246246
--- src/main.mk
+++ src/main.mk
@@ -235,11 +235,11 @@
235 $(SRCDIR)/fossil.page.fileedit.js \
236 $(SRCDIR)/fossil.page.forumpost.js \
237 $(SRCDIR)/fossil.page.pikchrshow.js \
238 $(SRCDIR)/fossil.page.wikiedit-wysiwyg-legacy.js \
239 $(SRCDIR)/fossil.page.wikiedit.js \
240 $(SRCDIR)/fossil.pikchr-util.js \
241 $(SRCDIR)/fossil.popupwidget.js \
242 $(SRCDIR)/fossil.storage.js \
243 $(SRCDIR)/fossil.tabs.js \
244 $(SRCDIR)/graph.js \
245 $(SRCDIR)/href.js \
246
--- src/main.mk
+++ src/main.mk
@@ -235,11 +235,11 @@
235 $(SRCDIR)/fossil.page.fileedit.js \
236 $(SRCDIR)/fossil.page.forumpost.js \
237 $(SRCDIR)/fossil.page.pikchrshow.js \
238 $(SRCDIR)/fossil.page.wikiedit-wysiwyg-legacy.js \
239 $(SRCDIR)/fossil.page.wikiedit.js \
240 $(SRCDIR)/fossil.pikchr.js \
241 $(SRCDIR)/fossil.popupwidget.js \
242 $(SRCDIR)/fossil.storage.js \
243 $(SRCDIR)/fossil.tabs.js \
244 $(SRCDIR)/graph.js \
245 $(SRCDIR)/href.js \
246
M src/pikchrshow.c
+3 -2
--- src/pikchrshow.c
+++ src/pikchrshow.c
@@ -167,13 +167,14 @@
167167
 } CX("</div>"/*#pikchrshow-output*/);
168168
 } CX("</fieldset>"/*#pikchrshow-output-wrapper*/);
169169
 } CX("</div>"/*sbs-wrapper*/);
170170
 if(!builtin_bundle_all_fossil_js_apis()){
171171
 builtin_emit_fossil_js_apis("dom", "fetch", "copybutton",
172
- "popupwidget", "storage", 0);
172
+ "popupwidget", "storage",
173
+ "pikchr", 0);
173174
 }
174
- builtin_emit_fossil_js_apis("page.pikchrshow", "pikchr-util", 0);
175
+ builtin_emit_fossil_js_apis("page.pikchrshow", 0);
175176
 builtin_fulfill_js_requests();
176177
 style_footer();
177178
 }
178179
179180
 /*
180181
--- src/pikchrshow.c
+++ src/pikchrshow.c
@@ -167,13 +167,14 @@
167 } CX("</div>"/*#pikchrshow-output*/);
168 } CX("</fieldset>"/*#pikchrshow-output-wrapper*/);
169 } CX("</div>"/*sbs-wrapper*/);
170 if(!builtin_bundle_all_fossil_js_apis()){
171 builtin_emit_fossil_js_apis("dom", "fetch", "copybutton",
172 "popupwidget", "storage", 0);
 
173 }
174 builtin_emit_fossil_js_apis("page.pikchrshow", "pikchr-util", 0);
175 builtin_fulfill_js_requests();
176 style_footer();
177 }
178
179 /*
180
--- src/pikchrshow.c
+++ src/pikchrshow.c
@@ -167,13 +167,14 @@
167 } CX("</div>"/*#pikchrshow-output*/);
168 } CX("</fieldset>"/*#pikchrshow-output-wrapper*/);
169 } CX("</div>"/*sbs-wrapper*/);
170 if(!builtin_bundle_all_fossil_js_apis()){
171 builtin_emit_fossil_js_apis("dom", "fetch", "copybutton",
172 "popupwidget", "storage",
173 "pikchr", 0);
174 }
175 builtin_emit_fossil_js_apis("page.pikchrshow", 0);
176 builtin_fulfill_js_requests();
177 style_footer();
178 }
179
180 /*
181
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -647,11 +647,11 @@
647647
 $(SRCDIR)/fossil.page.fileedit.js \
648648
 $(SRCDIR)/fossil.page.forumpost.js \
649649
 $(SRCDIR)/fossil.page.pikchrshow.js \
650650
 $(SRCDIR)/fossil.page.wikiedit-wysiwyg-legacy.js \
651651
 $(SRCDIR)/fossil.page.wikiedit.js \
652
- $(SRCDIR)/fossil.pikchr-util.js \
652
+ $(SRCDIR)/fossil.pikchr.js \
653653
 $(SRCDIR)/fossil.popupwidget.js \
654654
 $(SRCDIR)/fossil.storage.js \
655655
 $(SRCDIR)/fossil.tabs.js \
656656
 $(SRCDIR)/graph.js \
657657
 $(SRCDIR)/href.js \
658658
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -647,11 +647,11 @@
647 $(SRCDIR)/fossil.page.fileedit.js \
648 $(SRCDIR)/fossil.page.forumpost.js \
649 $(SRCDIR)/fossil.page.pikchrshow.js \
650 $(SRCDIR)/fossil.page.wikiedit-wysiwyg-legacy.js \
651 $(SRCDIR)/fossil.page.wikiedit.js \
652 $(SRCDIR)/fossil.pikchr-util.js \
653 $(SRCDIR)/fossil.popupwidget.js \
654 $(SRCDIR)/fossil.storage.js \
655 $(SRCDIR)/fossil.tabs.js \
656 $(SRCDIR)/graph.js \
657 $(SRCDIR)/href.js \
658
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -647,11 +647,11 @@
647 $(SRCDIR)/fossil.page.fileedit.js \
648 $(SRCDIR)/fossil.page.forumpost.js \
649 $(SRCDIR)/fossil.page.pikchrshow.js \
650 $(SRCDIR)/fossil.page.wikiedit-wysiwyg-legacy.js \
651 $(SRCDIR)/fossil.page.wikiedit.js \
652 $(SRCDIR)/fossil.pikchr.js \
653 $(SRCDIR)/fossil.popupwidget.js \
654 $(SRCDIR)/fossil.storage.js \
655 $(SRCDIR)/fossil.tabs.js \
656 $(SRCDIR)/graph.js \
657 $(SRCDIR)/href.js \
658
M win/Makefile.msc
+2 -2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -568,11 +568,11 @@
568568
 "$(SRCDIR)\fossil.page.fileedit.js" \
569569
 "$(SRCDIR)\fossil.page.forumpost.js" \
570570
 "$(SRCDIR)\fossil.page.pikchrshow.js" \
571571
 "$(SRCDIR)\fossil.page.wikiedit-wysiwyg-legacy.js" \
572572
 "$(SRCDIR)\fossil.page.wikiedit.js" \
573
- "$(SRCDIR)\fossil.pikchr-util.js" \
573
+ "$(SRCDIR)\fossil.pikchr.js" \
574574
 "$(SRCDIR)\fossil.popupwidget.js" \
575575
 "$(SRCDIR)\fossil.storage.js" \
576576
 "$(SRCDIR)\fossil.tabs.js" \
577577
 "$(SRCDIR)\graph.js" \
578578
 "$(SRCDIR)\href.js" \
@@ -1174,11 +1174,11 @@
11741174
 echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
11751175
 echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
11761176
 echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
11771177
 echo "$(SRCDIR)\fossil.page.wikiedit-wysiwyg-legacy.js" >> $@
11781178
 echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1179
- echo "$(SRCDIR)\fossil.pikchr-util.js" >> $@
1179
+ echo "$(SRCDIR)\fossil.pikchr.js" >> $@
11801180
 echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
11811181
 echo "$(SRCDIR)\fossil.storage.js" >> $@
11821182
 echo "$(SRCDIR)\fossil.tabs.js" >> $@
11831183
 echo "$(SRCDIR)\graph.js" >> $@
11841184
 echo "$(SRCDIR)\href.js" >> $@
11851185
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -568,11 +568,11 @@
568 "$(SRCDIR)\fossil.page.fileedit.js" \
569 "$(SRCDIR)\fossil.page.forumpost.js" \
570 "$(SRCDIR)\fossil.page.pikchrshow.js" \
571 "$(SRCDIR)\fossil.page.wikiedit-wysiwyg-legacy.js" \
572 "$(SRCDIR)\fossil.page.wikiedit.js" \
573 "$(SRCDIR)\fossil.pikchr-util.js" \
574 "$(SRCDIR)\fossil.popupwidget.js" \
575 "$(SRCDIR)\fossil.storage.js" \
576 "$(SRCDIR)\fossil.tabs.js" \
577 "$(SRCDIR)\graph.js" \
578 "$(SRCDIR)\href.js" \
@@ -1174,11 +1174,11 @@
1174 echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1175 echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1176 echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1177 echo "$(SRCDIR)\fossil.page.wikiedit-wysiwyg-legacy.js" >> $@
1178 echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1179 echo "$(SRCDIR)\fossil.pikchr-util.js" >> $@
1180 echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1181 echo "$(SRCDIR)\fossil.storage.js" >> $@
1182 echo "$(SRCDIR)\fossil.tabs.js" >> $@
1183 echo "$(SRCDIR)\graph.js" >> $@
1184 echo "$(SRCDIR)\href.js" >> $@
1185
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -568,11 +568,11 @@
568 "$(SRCDIR)\fossil.page.fileedit.js" \
569 "$(SRCDIR)\fossil.page.forumpost.js" \
570 "$(SRCDIR)\fossil.page.pikchrshow.js" \
571 "$(SRCDIR)\fossil.page.wikiedit-wysiwyg-legacy.js" \
572 "$(SRCDIR)\fossil.page.wikiedit.js" \
573 "$(SRCDIR)\fossil.pikchr.js" \
574 "$(SRCDIR)\fossil.popupwidget.js" \
575 "$(SRCDIR)\fossil.storage.js" \
576 "$(SRCDIR)\fossil.tabs.js" \
577 "$(SRCDIR)\graph.js" \
578 "$(SRCDIR)\href.js" \
@@ -1174,11 +1174,11 @@
1174 echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1175 echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1176 echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1177 echo "$(SRCDIR)\fossil.page.wikiedit-wysiwyg-legacy.js" >> $@
1178 echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1179 echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1180 echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1181 echo "$(SRCDIR)\fossil.storage.js" >> $@
1182 echo "$(SRCDIR)\fossil.tabs.js" >> $@
1183 echo "$(SRCDIR)\graph.js" >> $@
1184 echo "$(SRCDIR)\href.js" >> $@
1185

Keyboard Shortcuts

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