Skip to content

Commit

Permalink
Merge pull request #255 from tukcomCD2024/Frontend#248
Browse files Browse the repository at this point in the history
데모 배포
  • Loading branch information
SINHJ1 authored Jun 20, 2024
2 parents 46b7e27 + f54785e commit 0d2cd01
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
3 changes: 1 addition & 2 deletions frontend/src/Component/Contribution/ContributionPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,7 @@ function ContributionPage() {
}
@media (max-width: 800px) {
font-size: 8px;
padding: 1px;
visibility: hidden;
}
`;

Expand Down
10 changes: 6 additions & 4 deletions frontend/src/Component/Page/utils/yjs/BlockLock.js
Original file line number Diff line number Diff line change
Expand Up @@ -383,10 +383,12 @@ const BlockLock = forwardRef(({ ydocRef, editorRef }, ref) => {
}
} else {
removeYjsMapUnLockData(nickname);
yLineLocks.set(guid.toString(), nickname);
yUserLocks.set(nickname, guid.toString());
addIdToParagraph(guid.toString());
toastr.success(`블록 편집 잠금이 설정되었습니다.`);
ydocRef.current.transact(() => {
yLineLocks.set(guid.toString(), nickname);
yUserLocks.set(nickname, guid.toString());
addIdToParagraph(guid.toString());
toastr.success(`블록 편집 잠금이 설정되었습니다.`);
});
}
} catch (error) {
const hoverDiv = document.querySelector(".hoverDiv");
Expand Down

0 comments on commit 0d2cd01

Please sign in to comment.