Fossil SCM
Ongoing refactoring and feature-adding related to the JS/ajax components of the new diff views.
Commit
65aa2c9643a4b3d7d93a5dfa81916a219fa9a87ffec0f12e9f950dc979296eb5
Parent
be9602d0dfca004…
10 files changed
+1
-5
+1
-1
+6
-4
-8
+1
-3
+1
-1
+1
-1
+1
-1
+2
-2
+1
| --- src/builtin.c | ||
| +++ src/builtin.c | ||
| @@ -702,10 +702,11 @@ | ||
| 702 | 702 | ** the final one! */ |
| 703 | 703 | } fjs[] = { |
| 704 | 704 | /* This list ordering isn't strictly important. */ |
| 705 | 705 | {"confirmer", 0, 0}, |
| 706 | 706 | {"copybutton", 0, "dom\0"}, |
| 707 | + {"diff", 0, "dom\0fetch\0"}, | |
| 707 | 708 | {"dom", 0, 0}, |
| 708 | 709 | {"fetch", 0, 0}, |
| 709 | 710 | {"info-diff", 0, "dom\0"}, |
| 710 | 711 | {"numbered-lines", 0, "popupwidget\0copybutton\0"}, |
| 711 | 712 | {"pikchr", 0, "dom\0"}, |
| 712 | 713 |
| --- src/builtin.c | |
| +++ src/builtin.c | |
| @@ -702,10 +702,11 @@ | |
| 702 | ** the final one! */ |
| 703 | } fjs[] = { |
| 704 | /* This list ordering isn't strictly important. */ |
| 705 | {"confirmer", 0, 0}, |
| 706 | {"copybutton", 0, "dom\0"}, |
| 707 | {"dom", 0, 0}, |
| 708 | {"fetch", 0, 0}, |
| 709 | {"info-diff", 0, "dom\0"}, |
| 710 | {"numbered-lines", 0, "popupwidget\0copybutton\0"}, |
| 711 | {"pikchr", 0, "dom\0"}, |
| 712 |
| --- src/builtin.c | |
| +++ src/builtin.c | |
| @@ -702,10 +702,11 @@ | |
| 702 | ** the final one! */ |
| 703 | } fjs[] = { |
| 704 | /* This list ordering isn't strictly important. */ |
| 705 | {"confirmer", 0, 0}, |
| 706 | {"copybutton", 0, "dom\0"}, |
| 707 | {"diff", 0, "dom\0fetch\0"}, |
| 708 | {"dom", 0, 0}, |
| 709 | {"fetch", 0, 0}, |
| 710 | {"info-diff", 0, "dom\0"}, |
| 711 | {"numbered-lines", 0, "popupwidget\0copybutton\0"}, |
| 712 | {"pikchr", 0, "dom\0"}, |
| 713 |
-5
| --- src/diff.js | ||
| +++ src/diff.js | ||
| @@ -34,15 +34,10 @@ | ||
| 34 | 34 | } |
| 35 | 35 | var i, diffs = document.querySelectorAll('table.splitdiff') |
| 36 | 36 | for(i=0; i<diffs.length; i++){ |
| 37 | 37 | initDiff(diffs[i]); |
| 38 | 38 | } |
| 39 | - if(window.fossil && fossil.page){ | |
| 40 | - fossil.page.tweakSbsDiffs = function(){ | |
| 41 | - document.querySelectorAll('table.splitdiff').forEach(initDiff); | |
| 42 | - }; | |
| 43 | - } | |
| 44 | 39 | var lastWidth = 0; |
| 45 | 40 | function checkWidth(){ |
| 46 | 41 | if( document.body.clientWidth!=lastWidth ){ |
| 47 | 42 | lastWidth = document.body.clientWidth; |
| 48 | 43 | var w = lastWidth*0.5 - 100; |
| 49 | 44 |
| --- src/diff.js | |
| +++ src/diff.js | |
| @@ -34,15 +34,10 @@ | |
| 34 | } |
| 35 | var i, diffs = document.querySelectorAll('table.splitdiff') |
| 36 | for(i=0; i<diffs.length; i++){ |
| 37 | initDiff(diffs[i]); |
| 38 | } |
| 39 | if(window.fossil && fossil.page){ |
| 40 | fossil.page.tweakSbsDiffs = function(){ |
| 41 | document.querySelectorAll('table.splitdiff').forEach(initDiff); |
| 42 | }; |
| 43 | } |
| 44 | var lastWidth = 0; |
| 45 | function checkWidth(){ |
| 46 | if( document.body.clientWidth!=lastWidth ){ |
| 47 | lastWidth = document.body.clientWidth; |
| 48 | var w = lastWidth*0.5 - 100; |
| 49 |
| --- src/diff.js | |
| +++ src/diff.js | |
| @@ -34,15 +34,10 @@ | |
| 34 | } |
| 35 | var i, diffs = document.querySelectorAll('table.splitdiff') |
| 36 | for(i=0; i<diffs.length; i++){ |
| 37 | initDiff(diffs[i]); |
| 38 | } |
| 39 | var lastWidth = 0; |
| 40 | function checkWidth(){ |
| 41 | if( document.body.clientWidth!=lastWidth ){ |
| 42 | lastWidth = document.body.clientWidth; |
| 43 | var w = lastWidth*0.5 - 100; |
| 44 |
+1
-1
| --- src/fileedit.c | ||
| +++ src/fileedit.c | ||
| @@ -1999,11 +1999,11 @@ | ||
| 1999 | 1999 | ** fossil.page.fileedit.js. Potential TODO: move this into the |
| 2000 | 2000 | ** window.fossil bootstrapping so that we don't have to "fulfill" |
| 2001 | 2001 | ** the JS multiple times. |
| 2002 | 2002 | */ |
| 2003 | 2003 | ajax_emit_js_preview_modes(1); |
| 2004 | - builtin_request_js("diff.js"); | |
| 2004 | + builtin_fossil_js_bundle_or("diff", NULL); | |
| 2005 | 2005 | builtin_request_js("fossil.page.fileedit.js"); |
| 2006 | 2006 | builtin_fulfill_js_requests(); |
| 2007 | 2007 | { |
| 2008 | 2008 | /* Dynamically populate the editor, display any error in the err |
| 2009 | 2009 | ** blob, and/or switch to tab #0, where the file selector |
| 2010 | 2010 | |
| 2011 | 2011 | ADDED src/fossil.diff.js |
| 2012 | 2012 | DELETED src/fossil.info-diff.js |
| --- src/fileedit.c | |
| +++ src/fileedit.c | |
| @@ -1999,11 +1999,11 @@ | |
| 1999 | ** fossil.page.fileedit.js. Potential TODO: move this into the |
| 2000 | ** window.fossil bootstrapping so that we don't have to "fulfill" |
| 2001 | ** the JS multiple times. |
| 2002 | */ |
| 2003 | ajax_emit_js_preview_modes(1); |
| 2004 | builtin_request_js("diff.js"); |
| 2005 | builtin_request_js("fossil.page.fileedit.js"); |
| 2006 | builtin_fulfill_js_requests(); |
| 2007 | { |
| 2008 | /* Dynamically populate the editor, display any error in the err |
| 2009 | ** blob, and/or switch to tab #0, where the file selector |
| 2010 | |
| 2011 | DDED src/fossil.diff.js |
| 2012 | ELETED src/fossil.info-diff.js |
| --- src/fileedit.c | |
| +++ src/fileedit.c | |
| @@ -1999,11 +1999,11 @@ | |
| 1999 | ** fossil.page.fileedit.js. Potential TODO: move this into the |
| 2000 | ** window.fossil bootstrapping so that we don't have to "fulfill" |
| 2001 | ** the JS multiple times. |
| 2002 | */ |
| 2003 | ajax_emit_js_preview_modes(1); |
| 2004 | builtin_fossil_js_bundle_or("diff", NULL); |
| 2005 | builtin_request_js("fossil.page.fileedit.js"); |
| 2006 | builtin_fulfill_js_requests(); |
| 2007 | { |
| 2008 | /* Dynamically populate the editor, display any error in the err |
| 2009 | ** blob, and/or switch to tab #0, where the file selector |
| 2010 | |
| 2011 | DDED src/fossil.diff.js |
| 2012 | ELETED src/fossil.info-diff.js |
+6
-4
| --- a/src/fossil.diff.js | ||
| +++ b/src/fossil.diff.js | ||
| @@ -1,8 +1,10 @@ | ||
| 1 | -/** | |
| 2 | -.colsR){ | |
| 1 | + elemaddClass(D.tr(),'fe!=f.lastWidth ){ | |
| 2 | + f.colsL = } | |
| 3 | + } | |
| 4 | + if(!f.colsR){ | |
| 3 | 5 | } |
| 4 | 6 | } |
| 5 | 7 | } |
| 6 | 8 | ; |
| 7 | - width = '100%'; // setting to w caes unsightly horiz. scrol(D.tr(),'fe!=f.lastWidth ){ | |
| 8 | - | |
| 9 | + width = '100%'; // setting to w causes unsightly horiz. scrollbar | |
| 10 | + }var lastWidth = |
| --- a/src/fossil.diff.js | |
| +++ b/src/fossil.diff.js | |
| @@ -1,8 +1,10 @@ | |
| 1 | /** |
| 2 | .colsR){ |
| 3 | } |
| 4 | } |
| 5 | } |
| 6 | ; |
| 7 | width = '100%'; // setting to w caes unsightly horiz. scrol(D.tr(),'fe!=f.lastWidth ){ |
| 8 |
| --- a/src/fossil.diff.js | |
| +++ b/src/fossil.diff.js | |
| @@ -1,8 +1,10 @@ | |
| 1 | elemaddClass(D.tr(),'fe!=f.lastWidth ){ |
| 2 | f.colsL = } |
| 3 | } |
| 4 | if(!f.colsR){ |
| 5 | } |
| 6 | } |
| 7 | } |
| 8 | ; |
| 9 | width = '100%'; // setting to w causes unsightly horiz. scrollbar |
| 10 | }var lastWidth = |
D
src/fossil.info-diff.js
-8
| --- a/src/fossil.info-diff.js | ||
| +++ b/src/fossil.info-diff.js | ||
| @@ -1,8 +0,0 @@ | ||
| 1 | -/** | |
| 2 | -.colsR){ | |
| 3 | - } | |
| 4 | - } | |
| 5 | - } | |
| 6 | - ; | |
| 7 | - width = '100%'; // setting to w caes unsightly horiz. scrol(D.tr(),'fe!=f.lastWidth ){ | |
| 8 | - |
| --- a/src/fossil.info-diff.js | |
| +++ b/src/fossil.info-diff.js | |
| @@ -1,8 +0,0 @@ | |
| 1 | /** |
| 2 | .colsR){ |
| 3 | } |
| 4 | } |
| 5 | } |
| 6 | ; |
| 7 | width = '100%'; // setting to w caes unsightly horiz. scrol(D.tr(),'fe!=f.lastWidth ){ |
| 8 |
| --- a/src/fossil.info-diff.js | |
| +++ b/src/fossil.info-diff.js | |
| @@ -1,8 +0,0 @@ | |
+1
-3
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -442,11 +442,11 @@ | ||
| 442 | 442 | /* |
| 443 | 443 | ** Generate javascript to enhance HTML diffs. |
| 444 | 444 | */ |
| 445 | 445 | void append_diff_javascript(int diffType){ |
| 446 | 446 | if( diffType==0 ) return; |
| 447 | - builtin_request_js("diff.js"); | |
| 447 | + builtin_fossil_js_bundle_or("diff", NULL); | |
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | /* |
| 451 | 451 | ** Construct an appropriate diffFlag for text_diff() based on query |
| 452 | 452 | ** parameters and the to boolean arguments. |
| @@ -933,11 +933,10 @@ | ||
| 933 | 933 | append_file_change_line(zUuid, zName, zOld, zNew, zOldName, |
| 934 | 934 | pCfg,mperm); |
| 935 | 935 | } |
| 936 | 936 | db_finalize(&q3); |
| 937 | 937 | append_diff_javascript(diffType); |
| 938 | - builtin_fossil_js_bundle_or("info-diff",NULL); | |
| 939 | 938 | style_finish_page(); |
| 940 | 939 | } |
| 941 | 940 | |
| 942 | 941 | /* |
| 943 | 942 | ** WEBPAGE: winfo |
| @@ -1338,11 +1337,10 @@ | ||
| 1338 | 1337 | } |
| 1339 | 1338 | } |
| 1340 | 1339 | manifest_destroy(pFrom); |
| 1341 | 1340 | manifest_destroy(pTo); |
| 1342 | 1341 | append_diff_javascript(diffType); |
| 1343 | - builtin_fossil_js_bundle_or("info-diff",NULL); | |
| 1344 | 1342 | style_finish_page(); |
| 1345 | 1343 | } |
| 1346 | 1344 | |
| 1347 | 1345 | #if INTERFACE |
| 1348 | 1346 | /* |
| 1349 | 1347 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -442,11 +442,11 @@ | |
| 442 | /* |
| 443 | ** Generate javascript to enhance HTML diffs. |
| 444 | */ |
| 445 | void append_diff_javascript(int diffType){ |
| 446 | if( diffType==0 ) return; |
| 447 | builtin_request_js("diff.js"); |
| 448 | } |
| 449 | |
| 450 | /* |
| 451 | ** Construct an appropriate diffFlag for text_diff() based on query |
| 452 | ** parameters and the to boolean arguments. |
| @@ -933,11 +933,10 @@ | |
| 933 | append_file_change_line(zUuid, zName, zOld, zNew, zOldName, |
| 934 | pCfg,mperm); |
| 935 | } |
| 936 | db_finalize(&q3); |
| 937 | append_diff_javascript(diffType); |
| 938 | builtin_fossil_js_bundle_or("info-diff",NULL); |
| 939 | style_finish_page(); |
| 940 | } |
| 941 | |
| 942 | /* |
| 943 | ** WEBPAGE: winfo |
| @@ -1338,11 +1337,10 @@ | |
| 1338 | } |
| 1339 | } |
| 1340 | manifest_destroy(pFrom); |
| 1341 | manifest_destroy(pTo); |
| 1342 | append_diff_javascript(diffType); |
| 1343 | builtin_fossil_js_bundle_or("info-diff",NULL); |
| 1344 | style_finish_page(); |
| 1345 | } |
| 1346 | |
| 1347 | #if INTERFACE |
| 1348 | /* |
| 1349 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -442,11 +442,11 @@ | |
| 442 | /* |
| 443 | ** Generate javascript to enhance HTML diffs. |
| 444 | */ |
| 445 | void append_diff_javascript(int diffType){ |
| 446 | if( diffType==0 ) return; |
| 447 | builtin_fossil_js_bundle_or("diff", NULL); |
| 448 | } |
| 449 | |
| 450 | /* |
| 451 | ** Construct an appropriate diffFlag for text_diff() based on query |
| 452 | ** parameters and the to boolean arguments. |
| @@ -933,11 +933,10 @@ | |
| 933 | append_file_change_line(zUuid, zName, zOld, zNew, zOldName, |
| 934 | pCfg,mperm); |
| 935 | } |
| 936 | db_finalize(&q3); |
| 937 | append_diff_javascript(diffType); |
| 938 | style_finish_page(); |
| 939 | } |
| 940 | |
| 941 | /* |
| 942 | ** WEBPAGE: winfo |
| @@ -1338,11 +1337,10 @@ | |
| 1337 | } |
| 1338 | } |
| 1339 | manifest_destroy(pFrom); |
| 1340 | manifest_destroy(pTo); |
| 1341 | append_diff_javascript(diffType); |
| 1342 | style_finish_page(); |
| 1343 | } |
| 1344 | |
| 1345 | #if INTERFACE |
| 1346 | /* |
| 1347 |
+1
-1
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -224,13 +224,13 @@ | ||
| 224 | 224 | $(SRCDIR)/diff.tcl \ |
| 225 | 225 | $(SRCDIR)/forum.js \ |
| 226 | 226 | $(SRCDIR)/fossil.bootstrap.js \ |
| 227 | 227 | $(SRCDIR)/fossil.confirmer.js \ |
| 228 | 228 | $(SRCDIR)/fossil.copybutton.js \ |
| 229 | + $(SRCDIR)/fossil.diff.js \ | |
| 229 | 230 | $(SRCDIR)/fossil.dom.js \ |
| 230 | 231 | $(SRCDIR)/fossil.fetch.js \ |
| 231 | - $(SRCDIR)/fossil.info-diff.js \ | |
| 232 | 232 | $(SRCDIR)/fossil.numbered-lines.js \ |
| 233 | 233 | $(SRCDIR)/fossil.page.brlist.js \ |
| 234 | 234 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 235 | 235 | $(SRCDIR)/fossil.page.forumpost.js \ |
| 236 | 236 | $(SRCDIR)/fossil.page.pikchrshow.js \ |
| 237 | 237 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -224,13 +224,13 @@ | |
| 224 | $(SRCDIR)/diff.tcl \ |
| 225 | $(SRCDIR)/forum.js \ |
| 226 | $(SRCDIR)/fossil.bootstrap.js \ |
| 227 | $(SRCDIR)/fossil.confirmer.js \ |
| 228 | $(SRCDIR)/fossil.copybutton.js \ |
| 229 | $(SRCDIR)/fossil.dom.js \ |
| 230 | $(SRCDIR)/fossil.fetch.js \ |
| 231 | $(SRCDIR)/fossil.info-diff.js \ |
| 232 | $(SRCDIR)/fossil.numbered-lines.js \ |
| 233 | $(SRCDIR)/fossil.page.brlist.js \ |
| 234 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 235 | $(SRCDIR)/fossil.page.forumpost.js \ |
| 236 | $(SRCDIR)/fossil.page.pikchrshow.js \ |
| 237 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -224,13 +224,13 @@ | |
| 224 | $(SRCDIR)/diff.tcl \ |
| 225 | $(SRCDIR)/forum.js \ |
| 226 | $(SRCDIR)/fossil.bootstrap.js \ |
| 227 | $(SRCDIR)/fossil.confirmer.js \ |
| 228 | $(SRCDIR)/fossil.copybutton.js \ |
| 229 | $(SRCDIR)/fossil.diff.js \ |
| 230 | $(SRCDIR)/fossil.dom.js \ |
| 231 | $(SRCDIR)/fossil.fetch.js \ |
| 232 | $(SRCDIR)/fossil.numbered-lines.js \ |
| 233 | $(SRCDIR)/fossil.page.brlist.js \ |
| 234 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 235 | $(SRCDIR)/fossil.page.forumpost.js \ |
| 236 | $(SRCDIR)/fossil.page.pikchrshow.js \ |
| 237 |
+1
-1
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -1454,11 +1454,11 @@ | ||
| 1454 | 1454 | CX("</div>"/*#wikiedit-tab-save*/); |
| 1455 | 1455 | } |
| 1456 | 1456 | builtin_fossil_js_bundle_or("fetch", "dom", "tabs", "confirmer", |
| 1457 | 1457 | "storage", "popupwidget", "copybutton", |
| 1458 | 1458 | "pikchr", NULL); |
| 1459 | - builtin_request_js("diff.js"); | |
| 1459 | + builtin_fossil_js_bundle_or("diff", NULL); | |
| 1460 | 1460 | builtin_request_js("fossil.page.wikiedit.js"); |
| 1461 | 1461 | builtin_fulfill_js_requests(); |
| 1462 | 1462 | /* Dynamically populate the editor... */ |
| 1463 | 1463 | style_script_begin(__FILE__,__LINE__); |
| 1464 | 1464 | { |
| 1465 | 1465 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -1454,11 +1454,11 @@ | |
| 1454 | CX("</div>"/*#wikiedit-tab-save*/); |
| 1455 | } |
| 1456 | builtin_fossil_js_bundle_or("fetch", "dom", "tabs", "confirmer", |
| 1457 | "storage", "popupwidget", "copybutton", |
| 1458 | "pikchr", NULL); |
| 1459 | builtin_request_js("diff.js"); |
| 1460 | builtin_request_js("fossil.page.wikiedit.js"); |
| 1461 | builtin_fulfill_js_requests(); |
| 1462 | /* Dynamically populate the editor... */ |
| 1463 | style_script_begin(__FILE__,__LINE__); |
| 1464 | { |
| 1465 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -1454,11 +1454,11 @@ | |
| 1454 | CX("</div>"/*#wikiedit-tab-save*/); |
| 1455 | } |
| 1456 | builtin_fossil_js_bundle_or("fetch", "dom", "tabs", "confirmer", |
| 1457 | "storage", "popupwidget", "copybutton", |
| 1458 | "pikchr", NULL); |
| 1459 | builtin_fossil_js_bundle_or("diff", NULL); |
| 1460 | builtin_request_js("fossil.page.wikiedit.js"); |
| 1461 | builtin_fulfill_js_requests(); |
| 1462 | /* Dynamically populate the editor... */ |
| 1463 | style_script_begin(__FILE__,__LINE__); |
| 1464 | { |
| 1465 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -633,13 +633,13 @@ | ||
| 633 | 633 | $(SRCDIR)/diff.tcl \ |
| 634 | 634 | $(SRCDIR)/forum.js \ |
| 635 | 635 | $(SRCDIR)/fossil.bootstrap.js \ |
| 636 | 636 | $(SRCDIR)/fossil.confirmer.js \ |
| 637 | 637 | $(SRCDIR)/fossil.copybutton.js \ |
| 638 | + $(SRCDIR)/fossil.diff.js \ | |
| 638 | 639 | $(SRCDIR)/fossil.dom.js \ |
| 639 | 640 | $(SRCDIR)/fossil.fetch.js \ |
| 640 | - $(SRCDIR)/fossil.info-diff.js \ | |
| 641 | 641 | $(SRCDIR)/fossil.numbered-lines.js \ |
| 642 | 642 | $(SRCDIR)/fossil.page.brlist.js \ |
| 643 | 643 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 644 | 644 | $(SRCDIR)/fossil.page.forumpost.js \ |
| 645 | 645 | $(SRCDIR)/fossil.page.pikchrshow.js \ |
| 646 | 646 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -633,13 +633,13 @@ | |
| 633 | $(SRCDIR)/diff.tcl \ |
| 634 | $(SRCDIR)/forum.js \ |
| 635 | $(SRCDIR)/fossil.bootstrap.js \ |
| 636 | $(SRCDIR)/fossil.confirmer.js \ |
| 637 | $(SRCDIR)/fossil.copybutton.js \ |
| 638 | $(SRCDIR)/fossil.dom.js \ |
| 639 | $(SRCDIR)/fossil.fetch.js \ |
| 640 | $(SRCDIR)/fossil.info-diff.js \ |
| 641 | $(SRCDIR)/fossil.numbered-lines.js \ |
| 642 | $(SRCDIR)/fossil.page.brlist.js \ |
| 643 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 644 | $(SRCDIR)/fossil.page.forumpost.js \ |
| 645 | $(SRCDIR)/fossil.page.pikchrshow.js \ |
| 646 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -633,13 +633,13 @@ | |
| 633 | $(SRCDIR)/diff.tcl \ |
| 634 | $(SRCDIR)/forum.js \ |
| 635 | $(SRCDIR)/fossil.bootstrap.js \ |
| 636 | $(SRCDIR)/fossil.confirmer.js \ |
| 637 | $(SRCDIR)/fossil.copybutton.js \ |
| 638 | $(SRCDIR)/fossil.diff.js \ |
| 639 | $(SRCDIR)/fossil.dom.js \ |
| 640 | $(SRCDIR)/fossil.fetch.js \ |
| 641 | $(SRCDIR)/fossil.numbered-lines.js \ |
| 642 | $(SRCDIR)/fossil.page.brlist.js \ |
| 643 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 644 | $(SRCDIR)/fossil.page.forumpost.js \ |
| 645 | $(SRCDIR)/fossil.page.pikchrshow.js \ |
| 646 |
+2
-2
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -575,13 +575,13 @@ | ||
| 575 | 575 | "$(SRCDIR)\diff.tcl" \ |
| 576 | 576 | "$(SRCDIR)\forum.js" \ |
| 577 | 577 | "$(SRCDIR)\fossil.bootstrap.js" \ |
| 578 | 578 | "$(SRCDIR)\fossil.confirmer.js" \ |
| 579 | 579 | "$(SRCDIR)\fossil.copybutton.js" \ |
| 580 | + "$(SRCDIR)\fossil.diff.js" \ | |
| 580 | 581 | "$(SRCDIR)\fossil.dom.js" \ |
| 581 | 582 | "$(SRCDIR)\fossil.fetch.js" \ |
| 582 | - "$(SRCDIR)\fossil.info-diff.js" \ | |
| 583 | 583 | "$(SRCDIR)\fossil.numbered-lines.js" \ |
| 584 | 584 | "$(SRCDIR)\fossil.page.brlist.js" \ |
| 585 | 585 | "$(SRCDIR)\fossil.page.fileedit.js" \ |
| 586 | 586 | "$(SRCDIR)\fossil.page.forumpost.js" \ |
| 587 | 587 | "$(SRCDIR)\fossil.page.pikchrshow.js" \ |
| @@ -1183,13 +1183,13 @@ | ||
| 1183 | 1183 | echo "$(SRCDIR)\diff.tcl" >> $@ |
| 1184 | 1184 | echo "$(SRCDIR)\forum.js" >> $@ |
| 1185 | 1185 | echo "$(SRCDIR)\fossil.bootstrap.js" >> $@ |
| 1186 | 1186 | echo "$(SRCDIR)\fossil.confirmer.js" >> $@ |
| 1187 | 1187 | echo "$(SRCDIR)\fossil.copybutton.js" >> $@ |
| 1188 | + echo "$(SRCDIR)\fossil.diff.js" >> $@ | |
| 1188 | 1189 | echo "$(SRCDIR)\fossil.dom.js" >> $@ |
| 1189 | 1190 | echo "$(SRCDIR)\fossil.fetch.js" >> $@ |
| 1190 | - echo "$(SRCDIR)\fossil.info-diff.js" >> $@ | |
| 1191 | 1191 | echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@ |
| 1192 | 1192 | echo "$(SRCDIR)\fossil.page.brlist.js" >> $@ |
| 1193 | 1193 | echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@ |
| 1194 | 1194 | echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@ |
| 1195 | 1195 | echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@ |
| 1196 | 1196 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -575,13 +575,13 @@ | |
| 575 | "$(SRCDIR)\diff.tcl" \ |
| 576 | "$(SRCDIR)\forum.js" \ |
| 577 | "$(SRCDIR)\fossil.bootstrap.js" \ |
| 578 | "$(SRCDIR)\fossil.confirmer.js" \ |
| 579 | "$(SRCDIR)\fossil.copybutton.js" \ |
| 580 | "$(SRCDIR)\fossil.dom.js" \ |
| 581 | "$(SRCDIR)\fossil.fetch.js" \ |
| 582 | "$(SRCDIR)\fossil.info-diff.js" \ |
| 583 | "$(SRCDIR)\fossil.numbered-lines.js" \ |
| 584 | "$(SRCDIR)\fossil.page.brlist.js" \ |
| 585 | "$(SRCDIR)\fossil.page.fileedit.js" \ |
| 586 | "$(SRCDIR)\fossil.page.forumpost.js" \ |
| 587 | "$(SRCDIR)\fossil.page.pikchrshow.js" \ |
| @@ -1183,13 +1183,13 @@ | |
| 1183 | echo "$(SRCDIR)\diff.tcl" >> $@ |
| 1184 | echo "$(SRCDIR)\forum.js" >> $@ |
| 1185 | echo "$(SRCDIR)\fossil.bootstrap.js" >> $@ |
| 1186 | echo "$(SRCDIR)\fossil.confirmer.js" >> $@ |
| 1187 | echo "$(SRCDIR)\fossil.copybutton.js" >> $@ |
| 1188 | echo "$(SRCDIR)\fossil.dom.js" >> $@ |
| 1189 | echo "$(SRCDIR)\fossil.fetch.js" >> $@ |
| 1190 | echo "$(SRCDIR)\fossil.info-diff.js" >> $@ |
| 1191 | echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@ |
| 1192 | echo "$(SRCDIR)\fossil.page.brlist.js" >> $@ |
| 1193 | echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@ |
| 1194 | echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@ |
| 1195 | echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@ |
| 1196 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -575,13 +575,13 @@ | |
| 575 | "$(SRCDIR)\diff.tcl" \ |
| 576 | "$(SRCDIR)\forum.js" \ |
| 577 | "$(SRCDIR)\fossil.bootstrap.js" \ |
| 578 | "$(SRCDIR)\fossil.confirmer.js" \ |
| 579 | "$(SRCDIR)\fossil.copybutton.js" \ |
| 580 | "$(SRCDIR)\fossil.diff.js" \ |
| 581 | "$(SRCDIR)\fossil.dom.js" \ |
| 582 | "$(SRCDIR)\fossil.fetch.js" \ |
| 583 | "$(SRCDIR)\fossil.numbered-lines.js" \ |
| 584 | "$(SRCDIR)\fossil.page.brlist.js" \ |
| 585 | "$(SRCDIR)\fossil.page.fileedit.js" \ |
| 586 | "$(SRCDIR)\fossil.page.forumpost.js" \ |
| 587 | "$(SRCDIR)\fossil.page.pikchrshow.js" \ |
| @@ -1183,13 +1183,13 @@ | |
| 1183 | echo "$(SRCDIR)\diff.tcl" >> $@ |
| 1184 | echo "$(SRCDIR)\forum.js" >> $@ |
| 1185 | echo "$(SRCDIR)\fossil.bootstrap.js" >> $@ |
| 1186 | echo "$(SRCDIR)\fossil.confirmer.js" >> $@ |
| 1187 | echo "$(SRCDIR)\fossil.copybutton.js" >> $@ |
| 1188 | echo "$(SRCDIR)\fossil.diff.js" >> $@ |
| 1189 | echo "$(SRCDIR)\fossil.dom.js" >> $@ |
| 1190 | echo "$(SRCDIR)\fossil.fetch.js" >> $@ |
| 1191 | echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@ |
| 1192 | echo "$(SRCDIR)\fossil.page.brlist.js" >> $@ |
| 1193 | echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@ |
| 1194 | echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@ |
| 1195 | echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@ |
| 1196 |