ADDED src/fossil.page.whistory.js Index: src/fossil.page.whistory.js ================================================================== --- /dev/null +++ src/fossil.page.whistory.js @@ -0,0 +1,161 @@ +/* This script adds interactivity for wiki-history webpages. + * + * The main code is within the 'on-click' handler of the "diff" links. + * Instead of standard redirection it fills-in two hidden inputs with + * the appropriate values and submits the corresponding form. + * A special care should be taken if some intermediate edits are hidden. + * + * For the sake of compatibility with ascetic browsers the code tries + * to avoid modern API and ECMAScript constructs. This makes it less + * readable and may be reconsidered in the future. +*/ +window.addEventListener( 'load', function() { + +document.getElementById("wh-form").method = "GET"; + +var wh_id = document.getElementById("wh-id" ); +var wh_pid = document.getElementById("wh-pid"); +var wh_cleaner = document.getElementById("wh-cleaner"); +var wh_collapser = document.getElementById("wh-collapser"); + +var wh_radios = []; // user-visible controls for baseline selection +var wh_hidden = 0; // current number of hidden (collapsed) rows +var wh_selected = -1; // index of the currently selected radio-button + +var wh_onRadio = function( event ){ + + var indx = event.target.indx; + if( wh_selected == indx ){ + + wh_selected = -1; + event.target.checked = false; + } + else wh_selected = indx; +} +var wh_onDifflink = function( event ){ + + event.preventDefault(); + var indx = event.target.indx; + wh_id.value = wh_radios[indx].value; + + if( wh_hidden > 0 ){ + + var p = indx + 1; + if( wh_selected >= 0 ){ + + var tr = wh_radios[wh_selected].parentElement.parentElement; + if( ! tr.hidden ) + p = wh_selected; + } + while( p < wh_radios.length ){ + + if( ! wh_radios[p].parentElement.parentElement.hidden ) + break; + p++; + } + if( p < wh_radios.length ){ + + wh_pid.value = wh_radios[p].value; + wh_pid.checked = true; + } + else { // just render the wiki for the case of the first major edit + + var path = document.location.pathname.split("/"); + path.pop(); + var newpath = path.join("/") + "/info/" + wh_radios[indx].value; + document.location = document.location.origin + newpath; + return; + } + } + else if( wh_selected >= 0 ) { + + wh_pid.value = wh_radios[wh_selected].value; + wh_pid.checked = true; + } + else wh_pid.checked = false; + + document.getElementById("wh-form").submit(); +} +var wh_onCleaner = function() { + + if( wh_selected >= 0 ) { + + wh_radios[wh_selected].checked = false; + wh_selected = -1; + } +} +var wh_onCollapser = function( event ){ + + var collapsing = ( wh_hidden == 0 ); + for( var k = 0; k < wh_radios.length; k++ ){ + + var radio = wh_radios[k]; + var tr = radio.parentElement.parentElement; + if( tr.className == "wh-intermediate" ){ + + if( tr.hidden = ! tr.hidden ) + wh_hidden++; + else + wh_hidden--; + + } else if( radio.iterspan ) + radio.iterspan.hidden = ! collapsing; + } + if( wh_hidden > 0 ) { + + wh_collapser.title="Show intermediate edits"; + wh_collapser.innerHTML = " ♻ " + wh_hidden; + } + else { + + wh_collapser.title="Hide intermediate edits"; + wh_collapser.innerHTML = " ♲" + } +} + +var inputs = document.getElementsByTagName("input"); +for( var k = 0, indx = 0; k < inputs.length; k++ ) { + + var r = inputs[k]; + if( r.type == "radio" && r.name == "baseline" ) { + + wh_radios.push( r ); + r.indx = indx++; + r.addEventListener( "click", wh_onRadio ); + r.disabled = false; + var td = r.parentElement.nextElementSibling; + r.iterspan = td.getElementsByTagName("span")[0]; + } +} +for( var edits = 0, k = wh_radios.length - 1; k >= 0; k-- ) { + + var td = wh_radios[k].parentElement.nextElementSibling; + if( td.parentElement.className == "wh-intermediate" ) + + edits++; + + else if( edits > 0 ){ + + var span = td.getElementsByTagName("span")[0]; + span.innerHTML = " ♲" + edits; + wh_radios[k].iterspan = span; + edits = 0; + // also: ∪ (union) Σ (sigma) × (times) + } +} +var links = document.getElementsByTagName("a"); +for( var i = 0, indx = 0; i < links.length; i++ ) { + + var l = links[i]; + if( l.className == "wh-difflink" ){ + + l.indx = indx++; + l.addEventListener( "click", wh_onDifflink ); + } +} +wh_cleaner.addEventListener( "click", wh_onCleaner ); +wh_collapser.addEventListener( "click", wh_onCollapser ); +wh_collapser.title="Hide intermediate edits"; +wh_collapser.hidden = false; + +}); // window.addEventListener( 'load' ... Index: src/main.mk ================================================================== --- src/main.mk +++ src/main.mk @@ -229,10 +229,11 @@ $(SRCDIR)/fossil.info-diff.js \ $(SRCDIR)/fossil.numbered-lines.js \ $(SRCDIR)/fossil.page.fileedit.js \ $(SRCDIR)/fossil.page.forumpost.js \ $(SRCDIR)/fossil.page.pikchrshow.js \ + $(SRCDIR)/fossil.page.whistory.js \ $(SRCDIR)/fossil.page.wikiedit.js \ $(SRCDIR)/fossil.pikchr.js \ $(SRCDIR)/fossil.popupwidget.js \ $(SRCDIR)/fossil.storage.js \ $(SRCDIR)/fossil.tabs.js \ Index: src/wiki.c ================================================================== --- src/wiki.c +++ src/wiki.c @@ -1579,35 +1579,87 @@ ** showid Show RID values ** ** Show the complete change history for a single wiki page. */ void whistory_page(void){ + Stmt q; const char *zPageName; - Blob sql; - Stmt q; + double rNow; + int showRid; login_check_credentials(); if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; } zPageName = PD("name",""); style_set_current_feature("wiki"); style_header("History Of %s", zPageName); - blob_init(&sql, 0, 0); - blob_append(&sql, timeline_query_for_www(), -1); - blob_append_sql(&sql, - "AND event.objid IN (" - " SELECT tagxref.srcid" - " FROM tagxref, tag" - " WHERE tagxref.tagid=tag.tagid" - " AND tag.tagname='wiki-%q')" - " ORDER BY mtime DESC", - zPageName + showRid = P("showid")!=0; + db_prepare(&q, + "SELECT" + " event.mtime," + " blob.uuid," + " coalesce(event.euser,event.user)," + " event.objid," + " datetime(event.mtime)" + " FROM event, blob, tag, tagxref" + " WHERE event.type='w' AND blob.rid=event.objid" + " AND tag.tagname='wiki-%q'" + " AND tagxref.tagid=tag.tagid AND tagxref.srcid=event.objid" + " ORDER BY event.mtime DESC", + zPageName ); - db_prepare(&q, "%s", blob_sql_text(&sql)); - www_print_timeline(&q, - TIMELINE_DISJOINT|TIMELINE_GRAPH|TIMELINE_REFS, - 0, 0, 0, 0, 0, 0); + @

History of %h(zPageName)

+ form_begin( "id='wh-form'", "%R/wdiff" ); + @ + @ + @ + @ + @
+ @ + @ + @ + @ + @ + @ + if( showRid ){ + @ + } + @ + @ + rNow = db_double(0.0, "SELECT julianday('now')"); + char zAuthor[64]; memset( zAuthor, 0, sizeof(zAuthor) ); + while( db_step(&q)==SQLITE_ROW ){ + double rMtime = db_column_double(&q, 0); + const char *zUuid = db_column_text(&q, 1); + const char *zUser = db_column_text(&q, 2); + int wrid = db_column_int(&q, 3); + const char *zWhen = db_column_text(&q, 4); + /* sqlite3_int64 iMtime = (sqlite3_int64)(rMtime*86400.0); */ + char *zAge = human_readable_age(rNow - rMtime); + if( strncmp( zAuthor, zUser, sizeof(zAuthor) - 1 ) == 0 ) { + @ + } + else { + strncpy( zAuthor, zUser, sizeof(zAuthor) - 1 ); + @ + } + /* @ */ + @ + fossil_free(zAge); + @ + @ + @ + if( showRid ){ + @ + } + @ + @ + } + @
AgeHash⚓UserRID 
%s(zAge)%s(zAge)%z(href("%R/info/%s",zUuid))%S(zUuid)%h(zUser)%z(href("%R/artifact/%S",zUuid))%d(wrid)%z(chref("wh-difflink","%R/wdiff?id=%S",zUuid))diff
db_finalize(&q); - blob_reset(&sql); + builtin_request_js("fossil.page.whistory.js"); + /* style_table_sorter(); */ style_finish_page(); } /* ** WEBPAGE: wdiff @@ -1642,14 +1694,14 @@ zId = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid1); pW1 = manifest_get(rid1, CFTYPE_WIKI, 0); if( pW1==0 ) fossil_redirect_home(); blob_init(&w1, pW1->zWiki, -1); zPid = P("pid"); - if( zPid==0 && pW1->nParent ){ + if( ( zPid==0 || zPid[0] == 0 ) && pW1->nParent ){ zPid = pW1->azParent[0]; } - if( zPid ){ + if( zPid && zPid[0] != 0 ){ char *zDate; rid2 = name_to_typed_rid(zPid, "w"); pW2 = manifest_get(rid2, CFTYPE_WIKI, 0); blob_init(&w2, pW2->zWiki, -1); @

Changes to \