mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-05-19 13:35:30 +02:00
Merge branch 'develop' into pag-back
This commit is contained in:
@@ -108,8 +108,7 @@ function waitForDecode() {
|
||||
.then(() => {
|
||||
loaded = true;
|
||||
}, error => {
|
||||
console.error('Error occurred during decoding image', img.value, error);
|
||||
throw Error(error);
|
||||
console.log('Error occurred during decoding image', img.value, error);
|
||||
});
|
||||
} else {
|
||||
loaded = false;
|
||||
|
||||
@@ -57,14 +57,6 @@ const prepend = note => {
|
||||
}
|
||||
};
|
||||
|
||||
const onUserAdded = () => {
|
||||
tlComponent?.pagingComponent?.reload();
|
||||
};
|
||||
|
||||
const onUserRemoved = () => {
|
||||
tlComponent?.pagingComponent?.reload();
|
||||
};
|
||||
|
||||
let endpoint;
|
||||
let query;
|
||||
let connection;
|
||||
@@ -144,8 +136,6 @@ if (props.src === 'antenna') {
|
||||
listId: props.list,
|
||||
});
|
||||
connection.on('note', prepend);
|
||||
connection.on('userAdded', onUserAdded);
|
||||
connection.on('userRemoved', onUserRemoved);
|
||||
} else if (props.src === 'channel') {
|
||||
endpoint = 'channels/timeline';
|
||||
query = {
|
||||
|
||||
@@ -28,6 +28,7 @@ const common = {
|
||||
template: '<MkAd v-bind="props" />',
|
||||
};
|
||||
},
|
||||
/* FIXME: disabled because it still didn’t pass after applying #11267
|
||||
async play({ canvasElement, args }) {
|
||||
if (lock) {
|
||||
console.warn('This test is unexpectedly running twice in parallel, fix it!');
|
||||
@@ -77,6 +78,7 @@ const common = {
|
||||
lock = undefined;
|
||||
}
|
||||
},
|
||||
*/
|
||||
args: {
|
||||
prefer: [],
|
||||
specify: {
|
||||
|
||||
Reference in New Issue
Block a user