Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dima Krasner
Sharkey
Commits
b01a0325
Commit
b01a0325
authored
3 years ago
by
syuilo
Browse files
Options
Downloads
Patches
Plain Diff
fix(client): ノート詳細が開けないのを直したり
Fix #8305
parent
de6e3d64
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+8
-0
8 additions, 0 deletions
CHANGELOG.md
packages/client/src/components/note-detailed.vue
+13
-10
13 additions, 10 deletions
packages/client/src/components/note-detailed.vue
packages/client/src/components/note.vue
+1
-1
1 addition, 1 deletion
packages/client/src/components/note.vue
with
22 additions
and
11 deletions
CHANGELOG.md
+
8
−
0
View file @
b01a0325
...
...
@@ -10,6 +10,14 @@
You should also include the user name that made the change.
-->
## 12.x.x (unreleased)
### Improvements
-
### Bugfixes
-
クライアント: ノートの詳細が表示されない問題を修正 @syuilo
## 12.106.2 (2022/02/11)
### Bugfixes
...
...
This diff is collapsed.
Click to expand it.
packages/client/src/components/note-detailed.vue
+
13
−
10
View file @
b01a0325
...
...
@@ -154,11 +154,13 @@ const props = defineProps<{
const
inChannel
=
inject
(
'
inChannel
'
,
null
);
const
note
=
$ref
(
JSON
.
parse
(
JSON
.
stringify
(
props
.
note
)));
const
isRenote
=
(
props
.
note
.
renote
!=
null
&&
props
.
note
.
text
==
null
&&
props
.
note
.
fileIds
.
length
===
0
&&
props
.
note
.
poll
==
null
note
.
renote
!=
null
&&
note
.
text
==
null
&&
note
.
fileIds
.
length
===
0
&&
note
.
poll
==
null
);
const
el
=
ref
<
HTMLElement
>
();
...
...
@@ -166,8 +168,8 @@ const menuButton = ref<HTMLElement>();
const
renoteButton
=
ref
<
InstanceType
<
typeof
XRenoteButton
>>
();
const
renoteTime
=
ref
<
HTMLElement
>
();
const
reactButton
=
ref
<
HTMLElement
>
();
let
appearNote
=
$ref
(
isRenote
?
props
.
note
.
renote
as
misskey
.
entities
.
Note
:
props
.
note
);
const
isMyRenote
=
$i
&&
(
$i
.
id
===
props
.
note
.
userId
);
let
appearNote
=
$ref
(
isRenote
?
note
.
renote
as
misskey
.
entities
.
Note
:
note
);
const
isMyRenote
=
$i
&&
(
$i
.
id
===
note
.
userId
);
const
showContent
=
ref
(
false
);
const
isDeleted
=
ref
(
false
);
const
muted
=
ref
(
checkWordMute
(
appearNote
,
$i
,
defaultStore
.
state
.
mutedWords
));
...
...
@@ -188,8 +190,9 @@ const keymap = {
};
useNoteCapture
({
appearNote
:
$
$
(
appearNote
),
rootEl
:
el
,
note
:
$
$
(
appearNote
),
isDeletedRef
:
isDeleted
,
});
function
reply
(
viaKeyboard
=
false
):
void
{
...
...
@@ -237,12 +240,12 @@ function onContextmenu(ev: MouseEvent): void {
ev
.
preventDefault
();
react
();
}
else
{
os
.
contextMenu
(
getNoteMenu
({
note
:
props
.
note
,
translating
,
translation
,
menuButton
}),
ev
).
then
(
focus
);
os
.
contextMenu
(
getNoteMenu
({
note
:
note
,
translating
,
translation
,
menuButton
}),
ev
).
then
(
focus
);
}
}
function
menu
(
viaKeyboard
=
false
):
void
{
os
.
popupMenu
(
getNoteMenu
({
note
:
props
.
note
,
translating
,
translation
,
menuButton
}),
menuButton
.
value
,
{
os
.
popupMenu
(
getNoteMenu
({
note
:
note
,
translating
,
translation
,
menuButton
}),
menuButton
.
value
,
{
viaKeyboard
}).
then
(
focus
);
}
...
...
@@ -255,7 +258,7 @@ function showRenoteMenu(viaKeyboard = false): void {
danger
:
true
,
action
:
()
=>
{
os
.
api
(
'
notes/delete
'
,
{
noteId
:
props
.
note
.
id
noteId
:
note
.
id
});
isDeleted
.
value
=
true
;
}
...
...
This diff is collapsed.
Click to expand it.
packages/client/src/components/note.vue
+
1
−
1
View file @
b01a0325
...
...
@@ -180,7 +180,7 @@ const keymap = {
useNoteCapture
({
rootEl
:
el
,
note
:
$
$
(
appearNote
),
isDeletedRef
:
$
$
(
isDeleted
)
,
isDeletedRef
:
isDeleted
,
});
function
reply
(
viaKeyboard
=
false
):
void
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment