From 97332baf525b1ee551b07eaa7c544acc73a8cc66 Mon Sep 17 00:00:00 2001 From: Matt Mascarenhas Date: Sat, 3 Jun 2017 04:47:07 +0100 Subject: [PATCH] hmml_to_html.c: Fix lastFocused stuff [#24] --- hmml_to_html/hmml_to_html.c | 38 +++++++++++++++++++++++++++++-------- hmml_to_html/style.css | 10 ++++++++-- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/hmml_to_html/hmml_to_html.c b/hmml_to_html/hmml_to_html.c index 7bd5ce1..ccf9aa9 100644 --- a/hmml_to_html/hmml_to_html.c +++ b/hmml_to_html/hmml_to_html.c @@ -69,6 +69,7 @@ char *Credentials[ ][5] = { "nothings", "Sean Barrett", "https://nothings.org/", "", ""}, { "cmuratori", "Casey Muratori", "https://handmadehero.org", "patreon_logo.png", "https://patreon.com/cmuratori"}, { "fierydrake", "Mike Tunnicliffe", "", "", ""}, + { "abnercoimbre", "Abner Coimbre", "https://handmade.network/m/abnercoimbre", "patreon_logo.png", "https://patreon.com/handmade_dev"}, }; #define ArrayCount(A) sizeof(A)/sizeof(*(A)) @@ -1231,6 +1232,10 @@ TimecodeToSeconds(Anno->time)); "%s ", StringToColourHash(&Colour, Anno->author), Anno->author); + if(!HasMedium) + { + HasMedium = TRUE; + } } InPtr = Anno->text; @@ -1738,12 +1743,12 @@ CategoryMedium[j][2] if(HasFilterMenu) { CopyStringToBuffer(&Title, -" V Reset filter z Toggle filter mode between \"inclusive\" and \"exclusive\"\n"); +" z Toggle filter mode V Revert filter to original state\n"); } else { CopyStringToBuffer(&Title, -" V Reset filter z Toggle filter mode between \"inclusive\" and \"exclusive\"\n"); +" z Toggle filter mode V Revert filter to original state\n"); } CopyStringToBuffer(&Title, @@ -1976,10 +1981,14 @@ HMML.metadata.project); "\n" "var menuState = [];\n"); + CopyStringToBuffer(&Script, +"var quotesMenu = document.querySelector(\".quotes_container\");\n"); + if(HasQuoteMenu) { CopyStringToBuffer(&Script, -"var quotesMenu = document.querySelector(\".quotes_container\");\n" +"if(quotesMenu)\n" +"{\n" "menuState.push(quotesMenu);\n" "var quoteItems = quotesMenu.querySelectorAll(\".ref\");\n" "for(var i = 0; i < quoteItems.length; ++i)\n" @@ -1988,13 +1997,18 @@ HMML.metadata.project); " mouseOverQuotes(this);\n" " })\n" "};\n" -"var lastFocusedQuote = null;\n"); +"var lastFocusedQuote = null;\n" +"}\n"); } + CopyStringToBuffer(&Script, +"var referencesMenu = document.querySelector(\".references_container\");\n"); + if(HasReferenceMenu) { CopyStringToBuffer(&Script, -"var referencesMenu = document.querySelector(\".references_container\");\n" +"if(referencesMenu)\n" +"{\n" "menuState.push(referencesMenu);\n" "var referenceItems = referencesMenu.querySelectorAll(\".ref\");\n" "for(var i = 0; i < referenceItems.length; ++i)\n" @@ -2004,13 +2018,18 @@ HMML.metadata.project); " })\n" "};\n" "var lastFocusedReference = null;\n" -"var lastFocusedIdentifier = null;\n"); +"var lastFocusedIdentifier = null;\n" +"}\n"); } + CopyStringToBuffer(&Script, +"var filterMenu = document.querySelector(\".filter_container\");\n"); + if(HasFilterMenu) { CopyStringToBuffer(&Script, -"var filterMenu = document.querySelector(\".filter_container\");\n" +"if(filterMenu)\n" +"{\n" " menuState.push(filterMenu);\n" " var lastFocusedCategory = null;\n" " var lastFocusedTopic = null;\n" @@ -2036,13 +2055,16 @@ HMML.metadata.project); " });\n" "\n" "%s\n" +"}\n" "}\n", FilterState.Location); } + CopyStringToBuffer(&Script, +"var creditsMenu = document.querySelector(\".credits_container\");\n"); + if(HasCreditsMenu) { CopyStringToBuffer(&Script, -"var creditsMenu = document.querySelector(\".credits_container\");\n" "if(creditsMenu)\n" "{\n" " menuState.push(creditsMenu);\n" diff --git a/hmml_to_html/style.css b/hmml_to_html/style.css index 40b49ed..4bbe1c0 100644 --- a/hmml_to_html/style.css +++ b/hmml_to_html/style.css @@ -336,7 +336,8 @@ word-wrap: break-word; } -.markers_container > .marker.authored .content .author { +.markers_container > .marker.authored .content .author, +.markers_container > .marker.off_authored .content .author { font-style: normal; font-variant: normal; font-weight: bold; @@ -344,10 +345,15 @@ .title > .menu > .refs .ref .ref_title, .title .filter_content.authored .text, -.markers_container > .marker.authored { +.markers_container > .marker.authored, +.markers_container > .marker.off_authored { font-style: oblique; } +.markers_container > .marker.off_authored { + opacity: 0.5; +} + .markers_container > .marker .content sup { font-style: normal; font-variant: normal;