Compare commits
11 Commits
Author | SHA1 | Date |
---|---|---|
Matt Mascarenhas | 14dafa4abe | |
Matt Mascarenhas | 213bb2f882 | |
Matt Mascarenhas | 77aec74483 | |
Matt Mascarenhas | 6852d06e04 | |
Matt Mascarenhas | 52d6d989f8 | |
Matt Mascarenhas | df93674bf7 | |
Matt Mascarenhas | 026585e50b | |
Matt Mascarenhas | 9d5f0f9146 | |
Matt Mascarenhas | a7694d4c3b | |
Matt Mascarenhas | c9bf96c7aa | |
Matt Mascarenhas | 44a5008aa7 |
1890
cinera/cinera.c
1890
cinera/cinera.c
File diff suppressed because it is too large
Load Diff
|
@ -540,6 +540,16 @@ ul.cineraNavPlain li.current > a {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.cineraHelp .help_container .help_custom_index {
|
||||||
|
background-color: #159 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cineraHelp .help_container h2 .help_title_key {
|
||||||
|
padding: .2em;
|
||||||
|
border: 1px solid;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.cineraHelp .help_container .help_key {
|
.cineraHelp .help_container .help_key {
|
||||||
box-sizing: content-box;
|
box-sizing: content-box;
|
||||||
font-family: Inconsolata;
|
font-family: Inconsolata;
|
||||||
|
@ -614,12 +624,11 @@ ul.cineraNavPlain li.current > a {
|
||||||
.cineraMenus > .menu .credits_container {
|
.cineraMenus > .menu .credits_container {
|
||||||
border: 1px solid;
|
border: 1px solid;
|
||||||
border-top: none;
|
border-top: none;
|
||||||
display: none;
|
z-index: -1; /* NOTE(matt): Using "display: none" to hide them proved problematic for scrolling non-visible menus */
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
top: 100%;
|
top: 100%;
|
||||||
z-index: 8;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.cineraMenus > .menu .refs,
|
.cineraMenus > .menu .refs,
|
||||||
|
@ -639,7 +648,7 @@ ul.cineraNavPlain li.current > a {
|
||||||
}
|
}
|
||||||
|
|
||||||
.cineraMenus > .menu .visible {
|
.cineraMenus > .menu .visible {
|
||||||
display: block;
|
z-index: 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cineraMenus > .menu > .refs .ref {
|
.cineraMenus > .menu > .refs .ref {
|
||||||
|
@ -737,6 +746,11 @@ ul.cineraNavPlain li.current > a {
|
||||||
margin-right: 4px;
|
margin-right: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.cineraMenus > .menu > .filter_container .filter_header {
|
||||||
|
position: sticky;
|
||||||
|
top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.cineraMenus > .menu > .filter_container .filter_mode,
|
.cineraMenus > .menu > .filter_container .filter_mode,
|
||||||
.cineraMenus > .menu > .link_container #cineraLinkMode {
|
.cineraMenus > .menu > .link_container #cineraLinkMode {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
@ -756,11 +770,13 @@ ul.cineraNavPlain li.current > a {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.cineraMenus > .menu > .filter_container .filter_header .filter_titles,
|
||||||
.cineraMenus > .menu > .filter_container .filters {
|
.cineraMenus > .menu > .filter_container .filters {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-flow: row nowrap;
|
flex-flow: row nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.cineraMenus > .menu > .filter_container .filter_header .filter_titles > *,
|
||||||
.cineraMenus > .menu > .filter_container .filters > * {
|
.cineraMenus > .menu > .filter_container .filters > * {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
|
|
|
@ -4532,22 +4532,18 @@ PrintLineage(string Lineage, bool AppendNewline)
|
||||||
if(AppendNewline) { Print(stderr, "\n"); }
|
if(AppendNewline) { Print(stderr, "\n"); }
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
void
|
||||||
CopyLineageToBarePtr(char *Ptr, string Lineage, bool AppendNewline)
|
ExtendLineageInBook(memory_book *M, string Lineage, bool AppendNewline)
|
||||||
{
|
{
|
||||||
int Length = 0;
|
|
||||||
|
|
||||||
string Parent = StripComponentFromPath(Lineage);
|
string Parent = StripComponentFromPath(Lineage);
|
||||||
Length += CopyStringCToBarePtr(CS_BLACK_BOLD, Ptr + Length, Parent);
|
ExtendStringCInBook(M, CS_BLACK_BOLD, Parent);
|
||||||
if(Parent.Length > 0)
|
if(Parent.Length > 0)
|
||||||
{
|
{
|
||||||
Length += CopyStringCToBarePtr(CS_BLACK_BOLD, Ptr + Length, Wrap0("/"));
|
ExtendStringCInBook(M, CS_BLACK_BOLD, Wrap0("/"));
|
||||||
}
|
}
|
||||||
string Us = GetFinalComponent(Lineage);
|
string Us = GetFinalComponent(Lineage);
|
||||||
Length += CopyStringCToBarePtr(CS_BLUE_BOLD, Ptr + Length, Us);
|
ExtendStringCInBook(M, CS_BLUE_BOLD, Us);
|
||||||
if(AppendNewline) { Length += CopyStringToBarePtr(Ptr + Length, Wrap0("\n")); }
|
if(AppendNewline) { ExtendStringInBook(M, Wrap0("\n")); }
|
||||||
|
|
||||||
return Length;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t
|
uint8_t
|
||||||
|
@ -5073,7 +5069,7 @@ PositionRolesInConfig(config *C, resolution_errors *E, config_verifiers *V, scop
|
||||||
config_pair *Position = GetPair(*Role, IDENT_POSITION);
|
config_pair *Position = GetPair(*Role, IDENT_POSITION);
|
||||||
if(IsPositioned(Position))
|
if(IsPositioned(Position))
|
||||||
{
|
{
|
||||||
int TargetPos;
|
int TargetPos = 0;
|
||||||
if(Position->int64_t < 0)
|
if(Position->int64_t < 0)
|
||||||
{
|
{
|
||||||
TargetPos = SlotCount + Position->int64_t;
|
TargetPos = SlotCount + Position->int64_t;
|
||||||
|
|
|
@ -1,40 +1,5 @@
|
||||||
var cinera = document.querySelector(".cinera");
|
|
||||||
var baseURL = location.hash ? (location.toString().substr(0, location.toString().length - location.hash.length)) : location;
|
var baseURL = location.hash ? (location.toString().substr(0, location.toString().length - location.hash.length)) : location;
|
||||||
|
|
||||||
var originalTextContent = {
|
|
||||||
TitleQuotes: null,
|
|
||||||
TitleReferences: null,
|
|
||||||
TitleCredits: null,
|
|
||||||
EpisodePrev: null,
|
|
||||||
EpisodeNext: null,
|
|
||||||
};
|
|
||||||
|
|
||||||
var menuState = [];
|
|
||||||
var titleBar = cinera.querySelector(".cineraMenus");
|
|
||||||
var quotesMenu = null;
|
|
||||||
var referencesMenu = null;
|
|
||||||
var filterMenu = null;
|
|
||||||
var viewsMenu = null;
|
|
||||||
var linkMenu = null;
|
|
||||||
var creditsMenu = null;
|
|
||||||
var sourceMenus = null;
|
|
||||||
var helpButton = null;
|
|
||||||
var helpDocumentation = null;
|
|
||||||
|
|
||||||
// NOTE(matt): One set of markers per page. There is code to support multiple, which we may want to extend everywhere
|
|
||||||
var MarkersContainer = cinera.querySelector(".markers_container");
|
|
||||||
|
|
||||||
var views = {
|
|
||||||
REGULAR: 0,
|
|
||||||
THEATRE: 1,
|
|
||||||
SUPERTHEATRE: 2,
|
|
||||||
};
|
|
||||||
|
|
||||||
var devices = {
|
|
||||||
DESKTOP: 0,
|
|
||||||
MOBILE: 1,
|
|
||||||
};
|
|
||||||
|
|
||||||
var CineraProps = {
|
var CineraProps = {
|
||||||
C: null,
|
C: null,
|
||||||
V: views.REGULAR,
|
V: views.REGULAR,
|
||||||
|
@ -57,275 +22,19 @@ var CineraProps = {
|
||||||
};
|
};
|
||||||
CineraProps.O = GetRealOrientation(orientations.LANDSCAPE_LEFT, CineraProps.IsMobile);
|
CineraProps.O = GetRealOrientation(orientations.LANDSCAPE_LEFT, CineraProps.IsMobile);
|
||||||
|
|
||||||
if(titleBar)
|
|
||||||
{
|
|
||||||
quotesMenu = titleBar.querySelector(".quotes_container");
|
|
||||||
if(quotesMenu)
|
|
||||||
{
|
|
||||||
originalTextContent.TitleQuotes = quotesMenu.previousElementSibling.textContent;
|
|
||||||
menuState.push(quotesMenu);
|
|
||||||
var quoteItems = quotesMenu.querySelectorAll(".ref");
|
|
||||||
if(quoteItems)
|
|
||||||
{
|
|
||||||
for(var i = 0; i < quoteItems.length; ++i)
|
|
||||||
{
|
|
||||||
quoteItems[i].addEventListener("mouseenter", function(ev) {
|
|
||||||
mouseOverQuotes(this);
|
|
||||||
})
|
|
||||||
};
|
|
||||||
}
|
|
||||||
var quoteTimecodes = quotesMenu.querySelectorAll(".refs .ref .ref_indices .timecode");
|
|
||||||
for (var i = 0; i < quoteTimecodes.length; ++i) {
|
|
||||||
quoteTimecodes[i].addEventListener("click", function(ev) {
|
|
||||||
if (player) {
|
|
||||||
var time = ev.currentTarget.getAttribute("data-timestamp");
|
|
||||||
mouseSkipToTimecode(player, time, ev);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
var lastFocusedQuote = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
referencesMenu = titleBar.querySelector(".references_container");
|
|
||||||
if(referencesMenu)
|
|
||||||
{
|
|
||||||
originalTextContent.TitleReferences = referencesMenu.previousElementSibling.textContent;
|
|
||||||
menuState.push(referencesMenu);
|
|
||||||
var referenceItems = referencesMenu.querySelectorAll(".ref");
|
|
||||||
if(referenceItems)
|
|
||||||
{
|
|
||||||
for(var i = 0; i < referenceItems.length; ++i)
|
|
||||||
{
|
|
||||||
referenceItems[i].addEventListener("mouseenter", function(ev) {
|
|
||||||
mouseOverReferences(this);
|
|
||||||
})
|
|
||||||
};
|
|
||||||
var lastFocusedReference = null;
|
|
||||||
var lastFocusedIdentifier = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
var refTimecodes = referencesMenu.querySelectorAll(".refs .ref .ref_indices .timecode");
|
|
||||||
for (var i = 0; i < refTimecodes.length; ++i) {
|
|
||||||
refTimecodes[i].addEventListener("click", function(ev) {
|
|
||||||
if (player) {
|
|
||||||
var time = ev.currentTarget.getAttribute("data-timestamp");
|
|
||||||
mouseSkipToTimecode(player, time, ev);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(referencesMenu || quotesMenu)
|
|
||||||
{
|
|
||||||
var refSources = titleBar.querySelectorAll(".refs .ref"); // This is for both quotes and refs
|
|
||||||
for (var i = 0; i < refSources.length; ++i) {
|
|
||||||
refSources[i].addEventListener("click", function(ev) {
|
|
||||||
if (player) {
|
|
||||||
player.pause();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
filterMenu = titleBar.querySelector(".filter_container");
|
|
||||||
if(filterMenu)
|
|
||||||
{
|
|
||||||
menuState.push(filterMenu);
|
|
||||||
var lastFocusedCategory = null;
|
|
||||||
var lastFocusedTopic = null;
|
|
||||||
var lastFocusedMedium = null;
|
|
||||||
|
|
||||||
var filter = filterMenu.parentNode;
|
|
||||||
|
|
||||||
var filterModeElement = filter.querySelector(".filter_mode");
|
|
||||||
filterModeElement.addEventListener("click", function(ev) {
|
|
||||||
ev.stopPropagation();
|
|
||||||
toggleFilterMode();
|
|
||||||
});
|
|
||||||
|
|
||||||
var filterMode = filterModeElement.classList[1];
|
|
||||||
var filterItems = filter.querySelectorAll(".filter_content");
|
|
||||||
|
|
||||||
var filterInitState = new Object();
|
|
||||||
var filterState = new Object();
|
|
||||||
for(var i = 0; i < filterItems.length; ++i)
|
|
||||||
{
|
|
||||||
filterItems[i].addEventListener("mouseenter", function(ev) {
|
|
||||||
navigateFilter(this);
|
|
||||||
})
|
|
||||||
|
|
||||||
filterItems[i].addEventListener("click", function(ev) {
|
|
||||||
ev.stopPropagation();
|
|
||||||
filterItemToggle(this);
|
|
||||||
});
|
|
||||||
|
|
||||||
var filterItemName = filterItems[i].classList.item(1);
|
|
||||||
if(filterItems[i].parentNode.classList.contains("filter_topics"))
|
|
||||||
{
|
|
||||||
filterInitState[filterItemName] = { "type" : "topic", "off": (filterItems[i].classList.item(2) == "off") };
|
|
||||||
filterState[filterItemName] = { "type" : "topic", "off": (filterItems[i].classList.item(2) == "off") };
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
filterInitState[filterItemName] = { "type" : "medium", "off": (filterItems[i].classList.item(2) == "off") };
|
|
||||||
filterState[filterItemName] = { "type" : "medium", "off": (filterItems[i].classList.item(2) == "off") };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
viewsMenu = titleBar.querySelector(".views");
|
|
||||||
if(viewsMenu && !CineraProps.IsMobile)
|
|
||||||
{
|
|
||||||
menuState.push(viewsMenu);
|
|
||||||
var viewsContainer = viewsMenu.querySelector(".views_container");
|
|
||||||
viewsMenu.addEventListener("mouseenter", function(ev) {
|
|
||||||
handleMouseOverViewsMenu();
|
|
||||||
});
|
|
||||||
viewsMenu.addEventListener("mouseleave", function(ev) {
|
|
||||||
viewsContainer.style.display = "none";
|
|
||||||
});
|
|
||||||
|
|
||||||
var viewItems = viewsMenu.querySelectorAll(".view");
|
|
||||||
for(var i = 0; i < viewItems.length; ++i)
|
|
||||||
{
|
|
||||||
viewItems[i].addEventListener("click", function(ev) {
|
|
||||||
switch(this.getAttribute("data-id"))
|
|
||||||
{
|
|
||||||
case "regular":
|
|
||||||
case "theatre":
|
|
||||||
{
|
|
||||||
toggleTheatreMode();
|
|
||||||
} break;
|
|
||||||
case "super":
|
|
||||||
{
|
|
||||||
toggleSuperTheatreMode();
|
|
||||||
} break;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
linkMenu = titleBar.querySelector(".link_container");
|
|
||||||
linkTimestamp = true;
|
|
||||||
if(linkMenu)
|
|
||||||
{
|
|
||||||
menuState.push(linkMenu);
|
|
||||||
|
|
||||||
var linkMode = linkMenu.querySelector("#cineraLinkMode");
|
|
||||||
var link = linkMenu.querySelector("#cineraLink");
|
|
||||||
|
|
||||||
linkMode.addEventListener("click", function(ev) {
|
|
||||||
ev.stopPropagation();
|
|
||||||
toggleLinkMode(linkMode, link);
|
|
||||||
});
|
|
||||||
|
|
||||||
link.addEventListener("click", function(ev) {
|
|
||||||
CopyToClipboard(link);
|
|
||||||
toggleMenuVisibility(linkMenu);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
creditsMenu = titleBar.querySelector(".credits_container");
|
|
||||||
if(creditsMenu)
|
|
||||||
{
|
|
||||||
originalTextContent.TitleCredits = creditsMenu.previousElementSibling.textContent;
|
|
||||||
menuState.push(creditsMenu);
|
|
||||||
var lastFocusedCreditItem = null;
|
|
||||||
|
|
||||||
var creditItems = creditsMenu.querySelectorAll(".person, .support");
|
|
||||||
for(var i = 0; i < creditItems.length; ++i)
|
|
||||||
{
|
|
||||||
creditItems[i].addEventListener("mouseenter", function(ev) {
|
|
||||||
if(this != lastFocusedCreditItem)
|
|
||||||
{
|
|
||||||
lastFocusedCreditItem.classList.remove("focused");
|
|
||||||
unfocusSprite(lastFocusedCreditItem);
|
|
||||||
if(lastFocusedCreditItem.classList.contains("support"))
|
|
||||||
{
|
|
||||||
setSpriteLightness(lastFocusedCreditItem.firstChild);
|
|
||||||
}
|
|
||||||
lastFocusedCreditItem = this;
|
|
||||||
focusedElement = lastFocusedCreditItem;
|
|
||||||
focusedElement.classList.add("focused");
|
|
||||||
focusSprite(focusedElement);
|
|
||||||
if(focusedElement.classList.contains("support"))
|
|
||||||
{
|
|
||||||
setSpriteLightness(focusedElement.firstChild);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if(creditItems[i].tagName == "A")
|
|
||||||
{
|
|
||||||
creditItems[i].addEventListener("click", function(ev) {
|
|
||||||
if(player)
|
|
||||||
{
|
|
||||||
player.pause();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceMenus = titleBar.querySelectorAll(".menu");
|
|
||||||
|
|
||||||
helpButton = titleBar.querySelector(".cineraHelp");
|
|
||||||
helpDocumentation = helpButton.querySelector(".help_container");
|
|
||||||
BindHelp(helpButton, helpDocumentation);
|
|
||||||
}
|
|
||||||
|
|
||||||
var focusedElement = null;
|
|
||||||
var focusedIdentifier = null;
|
|
||||||
|
|
||||||
var playerContainer = cinera.querySelector(".cineraPlayerContainer")
|
|
||||||
var prevEpisode = playerContainer.querySelector(".episodeMarker.prev");
|
|
||||||
if(prevEpisode) { originalTextContent.EpisodePrev = prevEpisode.firstChild.textContent; }
|
|
||||||
var nextEpisode = playerContainer.querySelector(".episodeMarker.next");
|
|
||||||
if(nextEpisode) { originalTextContent.EpisodeNext = nextEpisode.firstChild.textContent; }
|
|
||||||
var testMarkers = playerContainer.querySelectorAll(".marker");
|
|
||||||
|
|
||||||
// NOTE(matt): All the originalTextContent values must be set by this point, because the player's construction may need them
|
|
||||||
var MobileCineraContentRuleSelector = ".cinera.mobile .cineraPlayerContainer .markers_container > .markers .marker .cineraContent";
|
var MobileCineraContentRuleSelector = ".cinera.mobile .cineraPlayerContainer .markers_container > .markers .marker .cineraContent";
|
||||||
var MobileCineraContentRule = GetOrSetRule(MobileCineraContentRuleSelector);
|
var MobileCineraContentRule = GetOrSetRule(MobileCineraContentRuleSelector);
|
||||||
|
|
||||||
var MenuContainerRuleSelector = ".cineraMenus > .menu .quotes_container, .cineraMenus > .menu .references_container, .cineraMenus > .menu .filter_container, .cineraMenus > .menu .views_container, .cineraMenus > .menu .link_container, .cineraMenus > .menu .credits_container";
|
var MenuContainerRuleSelector = ".cineraMenus > .menu .quotes_container, .cineraMenus > .menu .references_container, .cineraMenus > .menu .filter_container, .cineraMenus > .menu .views_container, .cineraMenus > .menu .link_container, .cineraMenus > .menu .credits_container";
|
||||||
var MenuContainerRule = GetOrSetRule(MenuContainerRuleSelector);
|
var MenuContainerRule = GetOrSetRule(MenuContainerRuleSelector);
|
||||||
|
|
||||||
if(CineraProps.IsMobile)
|
var cinera = document.querySelector(".cinera");
|
||||||
{
|
var player = new Player(cinera, onRefChanged);
|
||||||
InitMobileStyle();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var MenuMaxHeight = cinera.offsetHeight - titleBar.offsetHeight - 4;
|
|
||||||
MenuContainerRule.style.maxHeight = MenuMaxHeight + "px";
|
|
||||||
}
|
|
||||||
|
|
||||||
var player = new Player(playerContainer, onRefChanged);
|
|
||||||
|
|
||||||
if(CineraProps.IsMobile)
|
|
||||||
{
|
|
||||||
ConnectMobileControls(player);
|
|
||||||
}
|
|
||||||
|
|
||||||
var cineraViewStorageItem = "cineraView";
|
|
||||||
|
|
||||||
if(viewsMenu && localStorage.getItem(cineraViewStorageItem))
|
|
||||||
{
|
|
||||||
toggleTheatreMode();
|
|
||||||
}
|
|
||||||
|
|
||||||
InitScrollEventListener(cinera);
|
|
||||||
|
|
||||||
function
|
|
||||||
DelayedUpdateSize()
|
|
||||||
{
|
|
||||||
player.updateSize();
|
|
||||||
}
|
|
||||||
|
|
||||||
window.addEventListener("resize", function() {
|
window.addEventListener("resize", function() {
|
||||||
if(CineraProps.IsMobile)
|
if(CineraProps.IsMobile)
|
||||||
{
|
{
|
||||||
setTimeout(DelayedUpdateSize, 512);
|
setTimeout(DelayedUpdateSize, 512, player);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -333,10 +42,10 @@ window.addEventListener("resize", function() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
window.onorientationchange = function() {
|
screen.orientation.onchange = function() {
|
||||||
if(CineraProps.IsMobile)
|
if(CineraProps.IsMobile)
|
||||||
{
|
{
|
||||||
setTimeout(DelayedUpdateSize, 512);
|
setTimeout(DelayedUpdateSize, 512, player);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -351,43 +60,17 @@ document.addEventListener("keydown", function(ev) {
|
||||||
key = "capitalSpace";
|
key = "capitalSpace";
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!ev.getModifierState("Control") && handleKey(key) == true && focusedElement)
|
if(!ev.getModifierState("Control") && player.handleKey(key) == true && player.MenusFocused.Item)
|
||||||
{
|
{
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
for(var i = 0; i < sourceMenus.length; ++i)
|
document.addEventListener("fullscreenchange", function() {
|
||||||
{
|
if(!document.fullscreenElement && CineraProps.V == views.SUPERTHEATRE)
|
||||||
sourceMenus[i].addEventListener("mouseenter", function(ev) {
|
{
|
||||||
handleMenuTogglerInteraction(this, ev.type);
|
CineraProps.V = views.THEATRE;
|
||||||
})
|
localStorage.setItem(player.cineraViewStorageItem, views.THEATRE);
|
||||||
sourceMenus[i].addEventListener("mouseleave", function(ev) {
|
player.updateSize();
|
||||||
handleMenuTogglerInteraction(this, ev.type);
|
}
|
||||||
})
|
});
|
||||||
sourceMenus[i].addEventListener("click", function(ev) {
|
|
||||||
handleMenuTogglerInteraction(this, ev.type);
|
|
||||||
})
|
|
||||||
};
|
|
||||||
|
|
||||||
var colouredItems = playerContainer.querySelectorAll(".author, .member, .project");
|
|
||||||
for(i = 0; i < colouredItems.length; ++i)
|
|
||||||
{
|
|
||||||
setTextLightness(colouredItems[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
var topicDots = cinera.querySelectorAll(".category");
|
|
||||||
for(var i = 0; i < topicDots.length; ++i)
|
|
||||||
{
|
|
||||||
setDotLightness(topicDots[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
var lastTimestampStorageItem = "cineraTimecode_" + window.location.pathname;
|
|
||||||
var lastTimestamp;
|
|
||||||
if(location.hash) {
|
|
||||||
player.setTimeThenPlay(location.hash.startsWith('#') ? location.hash.substr(1) : location.hash);
|
|
||||||
}
|
|
||||||
else if(lastTimestamp = localStorage.getItem(lastTimestampStorageItem))
|
|
||||||
{
|
|
||||||
player.setTimeThenPlay(lastTimestamp);
|
|
||||||
}
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -13,6 +13,9 @@ DeriveReliableWindowDimensions()
|
||||||
Y: null,
|
Y: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
var ScrollPosX = window.scrollX;
|
||||||
|
var ScrollPosY = window.scrollY;
|
||||||
|
|
||||||
var DisplaySettings = [];
|
var DisplaySettings = [];
|
||||||
for(var i = 0; i < document.body.children.length; ++i)
|
for(var i = 0; i < document.body.children.length; ++i)
|
||||||
{
|
{
|
||||||
|
@ -40,6 +43,9 @@ DeriveReliableWindowDimensions()
|
||||||
Child.style.display = DisplaySettings.shift();
|
Child.style.display = DisplaySettings.shift();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ScrollTriggeredInternally = true;
|
||||||
|
window.scroll(ScrollPosX, ScrollPosY);
|
||||||
|
|
||||||
return Result;
|
return Result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -76,7 +82,7 @@ function IsVisible(Element, WindowDim) {
|
||||||
function
|
function
|
||||||
GetRealOrientation(PreferredLandscape, IsMobile)
|
GetRealOrientation(PreferredLandscape, IsMobile)
|
||||||
{
|
{
|
||||||
var Result = window.orientation;
|
var Result = screen.orientation.angle;
|
||||||
var WindowDim = GetWindowDim(IsMobile);
|
var WindowDim = GetWindowDim(IsMobile);
|
||||||
if(WindowDim.Y > WindowDim.X)
|
if(WindowDim.Y > WindowDim.X)
|
||||||
{
|
{
|
||||||
|
@ -186,14 +192,21 @@ function enableSprite(Element)
|
||||||
|
|
||||||
function disableSprite(Element)
|
function disableSprite(Element)
|
||||||
{
|
{
|
||||||
if(Element.classList.contains("cineraSprite"))
|
if(Element.classList.contains("focused"))
|
||||||
{
|
{
|
||||||
setSpriteLightness(Element);
|
focusSprite(Element);
|
||||||
Element.style.backgroundPositionY = Element.getAttribute("data-y-disabled") + "px";
|
|
||||||
}
|
}
|
||||||
for(var i = 0; i < Element.childElementCount; ++i)
|
else
|
||||||
{
|
{
|
||||||
disableSprite(Element.children[i]);
|
if(Element.classList.contains("cineraSprite"))
|
||||||
|
{
|
||||||
|
setSpriteLightness(Element);
|
||||||
|
Element.style.backgroundPositionY = Element.getAttribute("data-y-disabled") + "px";
|
||||||
|
}
|
||||||
|
for(var i = 0; i < Element.childElementCount; ++i)
|
||||||
|
{
|
||||||
|
disableSprite(Element.children[i]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -310,6 +323,7 @@ function IsInRangeEx(Min, N, Max)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Auto-scrolling */
|
/* Auto-scrolling */
|
||||||
|
var ScrollTriggeredInternally = false;
|
||||||
var LastScrollYPos = 0;
|
var LastScrollYPos = 0;
|
||||||
var ScrollTicking = false;
|
var ScrollTicking = false;
|
||||||
var ScrollerFunction;
|
var ScrollerFunction;
|
||||||
|
@ -376,7 +390,11 @@ function
|
||||||
InitScrollEventListener(Element, IsMobile, StickyObscuringElement)
|
InitScrollEventListener(Element, IsMobile, StickyObscuringElement)
|
||||||
{
|
{
|
||||||
window.addEventListener('scroll', function() {
|
window.addEventListener('scroll', function() {
|
||||||
if(ScrollCondition == undefined || ScrollCondition == true)
|
if(ScrollTriggeredInternally)
|
||||||
|
{
|
||||||
|
ScrollTriggeredInternally = false;
|
||||||
|
}
|
||||||
|
else if(ScrollCondition == undefined || ScrollCondition == true)
|
||||||
{
|
{
|
||||||
LastScrollYPos = window.scrollY;
|
LastScrollYPos = window.scrollY;
|
||||||
|
|
||||||
|
@ -503,17 +521,29 @@ IsOverflowed(Element)
|
||||||
return Element.scrollHeight > Element.clientHeight || Element.scrollWidth > Element.clientWidth;
|
return Element.scrollHeight > Element.clientHeight || Element.scrollWidth > Element.clientWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function
|
||||||
|
SetHelpUnfocused(Button)
|
||||||
|
{
|
||||||
|
Button.firstElementChild.innerText = "¿";
|
||||||
|
Button.firstElementChild.title = "Keypresses will not pass through to Cinera because focus is currently elsewhere.\n\nTo regain focus, please press Tab / Shift-Tab (multiple times) or click somewhere related to Cinera other than the video, e.g. this button";
|
||||||
|
}
|
||||||
|
|
||||||
|
function
|
||||||
|
SetHelpFocused(Button)
|
||||||
|
{
|
||||||
|
Button.firstElementChild.innerText = "?";
|
||||||
|
Button.firstElementChild.title = ""
|
||||||
|
}
|
||||||
|
|
||||||
function
|
function
|
||||||
BindHelp(Button, DocumentationContainer)
|
BindHelp(Button, DocumentationContainer)
|
||||||
{
|
{
|
||||||
window.addEventListener("blur", function(){
|
window.addEventListener("blur", function(){
|
||||||
Button.firstElementChild.innerText = "¿";
|
SetHelpUnfocused(Button);
|
||||||
Button.firstElementChild.title = "Keypresses will not pass through to Cinera because focus is currently elsewhere.\n\nTo regain focus, please press Tab / Shift-Tab (multiple times) or click somewhere related to Cinera other than the video, e.g. this button";
|
|
||||||
});
|
});
|
||||||
|
|
||||||
window.addEventListener("focus", function(){
|
window.addEventListener("focus", function(){
|
||||||
Button.firstElementChild.innerText = "?";
|
SetHelpFocused(Button);
|
||||||
Button.firstElementChild.title = ""
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Button.addEventListener("click", function() {
|
Button.addEventListener("click", function() {
|
||||||
|
@ -521,45 +551,16 @@ BindHelp(Button, DocumentationContainer)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function RGBtoHSL(colour)
|
|
||||||
{
|
|
||||||
var rgb = colour.slice(4, -1).split(", ");
|
|
||||||
var red = rgb[0];
|
|
||||||
var green = rgb[1];
|
|
||||||
var blue = rgb[2];
|
|
||||||
var min = Math.min(red, green, blue);
|
|
||||||
var max = Math.max(red, green, blue);
|
|
||||||
var chroma = max - min;
|
|
||||||
var hue = 0;
|
|
||||||
if(max == red)
|
|
||||||
{
|
|
||||||
hue = ((green - blue) / chroma) % 6;
|
|
||||||
}
|
|
||||||
else if(max == green)
|
|
||||||
{
|
|
||||||
hue = ((blue - red) / chroma) + 2;
|
|
||||||
}
|
|
||||||
else if(max == blue)
|
|
||||||
{
|
|
||||||
hue = ((red - green) / chroma) + 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
var saturation = chroma / 255 * 100;
|
|
||||||
hue = (hue * 60) < 0 ? 360 + (hue * 60) : (hue * 60);
|
|
||||||
|
|
||||||
return [hue, saturation]
|
|
||||||
}
|
|
||||||
|
|
||||||
function getBackgroundColourRGB(element) {
|
function getBackgroundColourRGB(element) {
|
||||||
var Colour = getComputedStyle(element).getPropertyValue("background-color");
|
var Colour = getComputedStyle(element).getPropertyValue("background-color");
|
||||||
var depth = 0;
|
var depth = 0;
|
||||||
while((Colour == "transparent" || Colour == "rgba(0, 0, 0, 0)") && depth <= 4)
|
while((Colour == "transparent" || Colour == "rgba(0, 0, 0, 0)") && element.parentElement && depth <= 4)
|
||||||
{
|
{
|
||||||
element = element.parentNode;
|
element = element.parentElement;
|
||||||
Colour = getComputedStyle(element).getPropertyValue("background-color");
|
Colour = getComputedStyle(element).getPropertyValue("background-color");
|
||||||
++depth;
|
++depth;
|
||||||
}
|
}
|
||||||
var Staging = Colour.slice(4, -1).split(", ");
|
var Staging = Colour.slice(Colour.indexOf("(") + 1, -1).split(", ");
|
||||||
var Result = {
|
var Result = {
|
||||||
R: parseInt(Staging[0]),
|
R: parseInt(Staging[0]),
|
||||||
G: parseInt(Staging[1]),
|
G: parseInt(Staging[1]),
|
||||||
|
@ -580,28 +581,34 @@ function setTextLightness(textElement)
|
||||||
{
|
{
|
||||||
var textHue = textElement.getAttribute("data-hue");
|
var textHue = textElement.getAttribute("data-hue");
|
||||||
var textSaturation = textElement.getAttribute("data-saturation");
|
var textSaturation = textElement.getAttribute("data-saturation");
|
||||||
if(getBackgroundBrightness(textElement.parentNode) < 127)
|
if(textHue && textSaturation)
|
||||||
{
|
{
|
||||||
textElement.style.color = ("hsl(" + textHue + ", " + textSaturation + ", 76%)");
|
if(getBackgroundBrightness(textElement.parentNode) < 127)
|
||||||
}
|
{
|
||||||
else
|
textElement.style.color = ("hsl(" + textHue + ", " + textSaturation + ", 76%)");
|
||||||
{
|
}
|
||||||
textElement.style.color = ("hsl(" + textHue + ", " + textSaturation + ", 24%)");
|
else
|
||||||
|
{
|
||||||
|
textElement.style.color = ("hsl(" + textHue + ", " + textSaturation + ", 24%)");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function setDotLightness(topicDot)
|
function setDotLightness(topicDot)
|
||||||
{
|
{
|
||||||
var Hue = RGBtoHSL(getComputedStyle(topicDot).getPropertyValue("background-color"))[0];
|
var dotHue = topicDot.getAttribute("data-hue");
|
||||||
var Saturation = RGBtoHSL(getComputedStyle(topicDot).getPropertyValue("background-color"))[1];
|
var dotSaturation = topicDot.getAttribute("data-saturation");
|
||||||
if(getBackgroundBrightness(topicDot.parentNode) < 127)
|
if(dotHue && dotSaturation)
|
||||||
{
|
{
|
||||||
topicDot.style.backgroundColor = ("hsl(" + Hue + ", " + Saturation + "%, 76%)");
|
if(getBackgroundBrightness(topicDot.parentNode) < 127)
|
||||||
topicDot.style.borderColor = ("hsl(" + Hue + ", " + Saturation + "%, 76%)");
|
{
|
||||||
}
|
topicDot.style.backgroundColor = ("hsl(" + dotHue + ", " + dotSaturation + ", 76%)");
|
||||||
else
|
topicDot.style.borderColor = ("hsl(" + dotHue + ", " + dotSaturation + ", 76%)");
|
||||||
{
|
}
|
||||||
topicDot.style.backgroundColor = ("hsl(" + Hue + ", " + Saturation + "%, 47%)");
|
else
|
||||||
topicDot.style.borderColor = ("hsl(" + Hue + ", " + Saturation + "%, 47%)");
|
{
|
||||||
|
topicDot.style.backgroundColor = ("hsl(" + dotHue + ", " + dotSaturation + ", 47%)");
|
||||||
|
topicDot.style.borderColor = ("hsl(" + dotHue + ", " + dotSaturation + ", 47%)");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -213,11 +213,11 @@ function prepareToParseIndexFile(project)
|
||||||
mode = "markers";
|
mode = "markers";
|
||||||
episode.markers = [];
|
episode.markers = [];
|
||||||
} else if (mode == "markers") {
|
} else if (mode == "markers") {
|
||||||
var match = line.match(/"(\d+)": "(.+)"/);
|
var match = line.match(/"(\d+.\d+)": "(.+)"/);
|
||||||
if (match == null) {
|
if (match == null) {
|
||||||
console.log(name, line);
|
console.log(name, line);
|
||||||
} else {
|
} else {
|
||||||
var totalTime = parseInt(line.slice(1));
|
var totalTime = parseFloat(line.slice(1));
|
||||||
var marker = {
|
var marker = {
|
||||||
totalTime: totalTime,
|
totalTime: totalTime,
|
||||||
prettyTime: markerTime(totalTime),
|
prettyTime: markerTime(totalTime),
|
||||||
|
@ -292,7 +292,7 @@ function markerTime(totalTime) {
|
||||||
var markTime = "(";
|
var markTime = "(";
|
||||||
var hours = Math.floor(totalTime / 60 / 60);
|
var hours = Math.floor(totalTime / 60 / 60);
|
||||||
var minutes = Math.floor(totalTime / 60) % 60;
|
var minutes = Math.floor(totalTime / 60) % 60;
|
||||||
var seconds = totalTime % 60;
|
var seconds = Math.floor(totalTime) % 60;
|
||||||
if (hours > 0) {
|
if (hours > 0) {
|
||||||
markTime += padTimeComponent(hours) + ":";
|
markTime += padTimeComponent(hours) + ":";
|
||||||
}
|
}
|
||||||
|
@ -460,7 +460,7 @@ function runSearch(refresh) {
|
||||||
Search.ResultsSummary.style.display = "none";
|
Search.ResultsSummary.style.display = "none";
|
||||||
}
|
}
|
||||||
|
|
||||||
var totalTime = Math.floor(totalSeconds/60/60) + "h " + Math.floor(totalSeconds/60)%60 + "m " + totalSeconds%60 + "s ";
|
var totalTime = Math.floor(totalSeconds/60/60) + "h " + Math.floor(totalSeconds/60)%60 + "m " + Math.floor(totalSeconds)%60 + "s ";
|
||||||
|
|
||||||
Search.ResultsSummary.textContent = "Found: " + numEpisodes + " episodes, " + numMarkers + " markers, " + totalTime + "total.";
|
Search.ResultsSummary.textContent = "Found: " + numEpisodes + " episodes, " + numMarkers + " markers, " + totalTime + "total.";
|
||||||
}
|
}
|
||||||
|
@ -3866,7 +3866,7 @@ InitResizeEventListener()
|
||||||
function
|
function
|
||||||
InitOrientationChangeListener()
|
InitOrientationChangeListener()
|
||||||
{
|
{
|
||||||
window.onorientationchange = function()
|
screen.orientation.onchange = function()
|
||||||
{
|
{
|
||||||
if(CineraProps.IsMobile)
|
if(CineraProps.IsMobile)
|
||||||
{
|
{
|
||||||
|
|
|
@ -76,7 +76,7 @@ typedef struct {
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int line;
|
int line;
|
||||||
|
|
||||||
int h, m, s;
|
int h, m, s, ms;
|
||||||
|
|
||||||
char* text;
|
char* text;
|
||||||
char* author;
|
char* author;
|
||||||
|
@ -471,7 +471,7 @@ next_attr:
|
||||||
|
|
||||||
static void _hmml_parse_timecode(struct _hmml_parser* p, HMML_Timestamp* ts)
|
static void _hmml_parse_timecode(struct _hmml_parser* p, HMML_Timestamp* ts)
|
||||||
{
|
{
|
||||||
unsigned int h = 0, m = 0, s = 0;
|
unsigned int h = 0, m = 0, s = 0, ms = 0;
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
int count = sscanf(p->cursor, "[%u:%u%n", &m, &s, &offset);
|
int count = sscanf(p->cursor, "[%u:%u%n", &m, &s, &offset);
|
||||||
|
|
||||||
|
@ -485,7 +485,7 @@ static void _hmml_parse_timecode(struct _hmml_parser* p, HMML_Timestamp* ts)
|
||||||
if(c == ':') {
|
if(c == ':') {
|
||||||
unsigned int tmp;
|
unsigned int tmp;
|
||||||
offset = 0;
|
offset = 0;
|
||||||
if(sscanf(p->cursor, ":%u]%n", &tmp, &offset) != 1 || offset == 0) {
|
if(sscanf(p->cursor, ":%u%n", &tmp, &offset) != 1 || offset == 0) {
|
||||||
_hmml_err(p, "Unable to parse 3-part timecode");
|
_hmml_err(p, "Unable to parse 3-part timecode");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -494,6 +494,27 @@ static void _hmml_parse_timecode(struct _hmml_parser* p, HMML_Timestamp* ts)
|
||||||
s = tmp;
|
s = tmp;
|
||||||
|
|
||||||
p->cursor += offset;
|
p->cursor += offset;
|
||||||
|
c = *p->cursor;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(c == '.') {
|
||||||
|
unsigned int tmp;
|
||||||
|
offset = 0;
|
||||||
|
|
||||||
|
int non_number_chars = 2;
|
||||||
|
int digits_in_100 = 3;
|
||||||
|
int max_chars_to_parse = non_number_chars + digits_in_100;
|
||||||
|
|
||||||
|
if(sscanf(p->cursor, ".%u]%n", &tmp, &offset) != 1 || offset == 0 || offset > max_chars_to_parse) {
|
||||||
|
_hmml_err(p, "Unable to parse %u.5-part timecode", h ? 3 : 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
for(int i = offset - non_number_chars; i < digits_in_100; ++i) {
|
||||||
|
tmp *= 10;
|
||||||
|
}
|
||||||
|
ms = tmp;
|
||||||
|
|
||||||
|
p->cursor += offset;
|
||||||
|
|
||||||
} else if(c != ']') {
|
} else if(c != ']') {
|
||||||
_hmml_err(p, "Unable to parse timecode");
|
_hmml_err(p, "Unable to parse timecode");
|
||||||
|
@ -501,6 +522,10 @@ static void _hmml_parse_timecode(struct _hmml_parser* p, HMML_Timestamp* ts)
|
||||||
++p->cursor;
|
++p->cursor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(ms >= 1000) {
|
||||||
|
_hmml_err(p, "Milliseconds cannot exceed 999");
|
||||||
|
}
|
||||||
|
|
||||||
if(s >= 60) {
|
if(s >= 60) {
|
||||||
_hmml_err(p, "Seconds cannot exceed 59");
|
_hmml_err(p, "Seconds cannot exceed 59");
|
||||||
}
|
}
|
||||||
|
@ -512,6 +537,7 @@ static void _hmml_parse_timecode(struct _hmml_parser* p, HMML_Timestamp* ts)
|
||||||
ts->h = h;
|
ts->h = h;
|
||||||
ts->m = m;
|
ts->m = m;
|
||||||
ts->s = s;
|
ts->s = s;
|
||||||
|
ts->ms = ms;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void _hmml_store_marker(struct _hmml_parser* p, HMML_Timestamp* ts, char** out, char* text_mem, size_t text_mem_size)
|
static void _hmml_store_marker(struct _hmml_parser* p, HMML_Timestamp* ts, char** out, char* text_mem, size_t text_mem_size)
|
||||||
|
@ -824,7 +850,7 @@ void hmml_free(HMML_Output* out)
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct HMML_Version hmml_version = {
|
const struct HMML_Version hmml_version = {
|
||||||
2, 0, 14
|
2, 0, 15
|
||||||
};
|
};
|
||||||
|
|
||||||
#undef HSTX
|
#undef HSTX
|
||||||
|
|
Loading…
Reference in New Issue