forks/forgejo
1
0
Fork 0
Code Releases Activity

Re-fix #12095 again (#12138)

Browse source 
Unfortunately some of the suggested changes to #12095 introduced
bugs which due to caching behaviour of sharedworkers were not caught
on simple tests.

These are as follows:

* Changing from simple for loop to use includes here:

```js
  register(port) {
    if (!this.clients.includes(port)) return;

    this.clients.push(port);

    port.postMessage({
      type: 'status',
      message: `registered to ${this.url}`,
    });
  }
```

The additional `!` prevents any clients from being added and should
read:

```js
    if (this.clients.includes(port)) return;
```

* Dropping the use of jQuery `$(...)` selection and using DOM
`querySelector` here:

```js
async function receiveUpdateCount(event) {
  try {
    const data = JSON.parse(event.data);

    const notificationCount = document.querySelector('.notification_count');
    if (data.Count > 0) {
      notificationCount.classList.remove('hidden');
    } else {
      notificationCount.classList.add('hidden');
    }

    notificationCount.text() = `${data.Count}`;
    await updateNotificationTable();
  } catch (error) {
    console.error(error, event);
  }
}
```

Requires that `notificationCount.text()` be changed to use `textContent`
instead.

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2020-07-04 23:04:00 +01:00 committed by GitHub
parent 60cb9fe448
commit 3c4388f668
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web_src/js/features/eventsource.sharedworker.js
View file

@ -16,7 +16,7 @@ class Source {
} }
register(port) { register(port) {
if (!this.clients.includes(port)) return; if (this.clients.includes(port)) return;
this.clients.push(port); this.clients.push(port);

2
web_src/js/features/notification.js
View file

@ -29,7 +29,7 @@ async function receiveUpdateCount(event) {
notificationCount.classList.add('hidden'); notificationCount.classList.add('hidden');
} }
notificationCount.text(`${data.Count}`); notificationCount.textContent = `${data.Count}`;
await updateNotificationTable(); await updateNotificationTable();
} catch (error) { } catch (error) {
console.error(error, event); console.error(error, event);