Feature/#19 notifications tab title #31
|
|
@ -1,22 +1,26 @@
|
|||
import * as core from '../utils/aniwatchCore';
|
||||
import * as helper from '../utils/helpers';
|
||||
|
||||
let __notificationCount = '';
|
||||
|
||||
runAfterLoad(() => {
|
||||
retrieveLoginStatus();
|
||||
__notificationCount = getNotificationCount();
|
||||
displayNotificationsInTitle();
|
||||
}, ".*");
|
||||
export function init() {
|
||||
core.runAfterLoad(() => {
|
||||
retrieveLoginStatus();
|
||||
__notificationCount = getNotificationCount();
|
||||
displayNotificationsInTitle();
|
||||
Do you remember how exactly you produced that bug with the number written in the title multiple times? I haven´t seen that yet. But something else I noticed was the fact, the title seems to be updated by aniwatch after the blue loading bar on the top disappears. This should be investigated as a new opportunity to decide when we update the title and also would fix the current issue, that we just guess a random number to wait until location change before we update the title, which doesn´t always works as the following gif shows: Do you remember how exactly you produced that bug with the number written in the title multiple times? I haven´t seen that yet.
But something else I noticed was the fact, the title seems to be updated by aniwatch after the blue loading bar on the top disappears. This should be investigated as a new opportunity to decide when we update the title and also would fix the current issue, that we just guess a random number to wait until location change before we update the title, which doesn´t always works as the following gif shows:
Yeah thats what I meant. Looks like we should not only wait for the popState but also for onload once their preloader is fixed, or wait for the loading bar to disappear(?) Yeah thats what I meant. Looks like we should not only wait for the popState but also for onload once their preloader is fixed, or wait for the loading bar to disappear(?)
I introduced another observer, which will execute after the blue loading bar in the top disappears. This error seems not to appear any more with that specific change. I introduced another observer, which will execute after the blue loading bar in the top disappears. This error seems not to appear any more with that specific change.
- [x] There still is the problem, that some pages have a different loading method where the menu isn´t available directly in the DOM.
I was able to fix this. We started our scripts after the preloader disappeared. We now also wait for the I was able to fix this. We started our scripts after the preloader disappeared. We now also wait for the `document.readyState` to be `"complete"` so we can ensure *everything* is loaded correctly, as the preloader disappears to early on some pages.
|
||||
}, ".*");
|
||||
|
||||
runAfterPathnameChange(() => {
|
||||
displayNotificationsInTitle();
|
||||
}, ".*");
|
||||
core.runAfterPathnameChange(() => {
|
||||
displayNotificationsInTitle();
|
||||
}, ".*");
|
||||
}
|
||||
|
||||
function getNotificationCount() {
|
||||
if (isLoggedIn) {
|
||||
if (core.isLoggedIn()) {
|
||||
let menuUserText = document.getElementById('materialize-menu-dropdown').innerText.split('\n')[4];
|
||||
let notificationCount = menuUserText.split("")[6];
|
||||
console.log(notificationCount);
|
||||
let notificationCount = menuUserText.split('')[6];
|
||||
// If there are no notifications
|
||||
if (Number.isNaN(parseInt(notificationCount)) || typeof notificationCount === 'undefined') {
|
||||
if (Number.isNaN(parseInt(notificationCount)) || !helper.assigned(notificationCount)) {
|
||||
console.warn("NaN or undefined");
|
||||
return ``; // Otherwise displayNotificationsInTitle() throws undefined again
|
||||
}
|
||||
|
|
@ -29,10 +33,9 @@ function getNotificationCount() {
|
|||
|
||||
function displayNotificationsInTitle() {
|
||||
console.log(__notificationCount);
|
||||
if (typeof __notificationCount === 'undefined') {
|
||||
if (!helper.assigned(__notificationCount)) {
|
||||
console.error("NoTiFiCaTiOnCoUnT uNdEfInEd!");
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
document.title = __notificationCount + document.title;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -7,6 +7,7 @@ import { initHelpers } from './utils/helpers';
|
|||
// enhancements
|
||||
import { init as animeRequests } from './enhancements/animeRequests';
|
||||
import { init as lists } from './enhancements/lists';
|
||||
import { init as notifications } from './enhancements/notifications';
|
||||
import { init as quickSearch } from './enhancements/quickSearch';
|
||||
|
||||
// core
|
||||
|
|
@ -18,4 +19,5 @@ initHelpers();
|
|||
// enhancements
|
||||
animeRequests();
|
||||
lists();
|
||||
notifications();
|
||||
quickSearch();
|
||||
|
|
@ -72,8 +72,20 @@ function awaitPageLoaded() {
|
|||
}, 100);
|
||||
}
|
||||
|
We should rename this, if we keep using the pushState event. We should rename this, if we keep using the pushState event.
What would you suggest? Maybe location change? I think each pushstate also always could be a location change maybe? What would you suggest? Maybe location change? I think each pushstate also always could be a location change maybe?
would be fine imo ```suggestion
export function runAfterLocationChange(func, pattern = '.*') {
```
would be fine imo
Renamed this with commit Renamed this with commit a840f644b723cb885232f4184698db2a27bc5f7d
|
||||
|
||||
function runAfterPathnameChange(func, pattern = '.*') {
|
||||
__afterPathnameChangeScripts.push({ "function": func, "pattern": pattern});
|
||||
export function runAfterPathnameChange(func, pattern = '.*') {
|
||||
__afterPathnameChangeScripts.push({ "function": func, "pattern": pattern });
|
||||
}
|
||||
|
||||
export function isLoggedIn() {
|
||||
let menu = document.getElementById('materialize-menu-dropdown');
|
||||
let result = true;
|
||||
|
||||
menu.innerText.split('\n').forEach(item => {
|
||||
if (item === 'Login') {
|
||||
result = false;
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
let locationPath = location.pathname;
|
||||
|
|
@ -90,4 +102,4 @@ function awaitPathnameChange() {
|
|||
script.function();
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -18,6 +18,10 @@ export function onReady(fn) {
|
|||
}
|
||||
}
|
||||
|
||||
export function assigned(obj) {
|
||||
return !(typeof obj === 'undefined' || obj === null);
|
||||
}
|
||||
|
||||
function handleKeyDown(event) {
|
||||
handleKeyToggle(event, true);
|
||||
}
|
||||
|
|
@ -32,16 +36,4 @@ function handleKeyToggle(event, isPressed) {
|
|||
} else if (event.key === 'Control') {
|
||||
isCtrlPressed = isPressed;
|
||||
}
|
||||
}
|
||||
|
||||
export function retrieveLoginStatus() {
|
||||
let menu = document.getElementById('materialize-menu-dropdown');
|
||||
let menuItem = menu.innerText.split('\n')[4];
|
||||
if (menuItem === 'Login') {
|
||||
isLoggedIn = false;
|
||||
console.log(isLoggedIn);
|
||||
} else if (menuItem.includes('User')) {
|
||||
isLoggedIn = true;
|
||||
console.log(isLoggedIn);
|
||||
}
|
||||
}
|
||||
Getting the NotificationCount on every pushState event increases the chance of it failing. With this solution it fails for every item of the Community and Anime dropdownmenus. With the old solution it failed when inserting the Count into the title for the stats, jobs, seasonal, airing, random, profile, watchlist and notifications. 10 vs 8 pathnames where it doesn't work.
Furthermore with this solution we run into problems on the profile pathname:
We are adding the NotificationCount to the old count whenever we switch from one tab under profile to another; this did not happen with the old solution.
This seems to be related to #42 tho, if you enable Low-end mobile and check the pathnames after visting /home first, you'll see the notification count appear for a while and then disappear once the site is fully shown. With the new solution its definitely because of #42; we are trying to access the menu while the page isn't fully loaded.