IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1075 from ONLYOFFICE/bugfix/options-editor

Browse Source 
Bugfix/options editor
This commit is contained in:
Nikita Gopienko 2022-11-23 13:49:39 +03:00 committed by GitHub
commit 0ff6e91698
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
packages/editor/src/client/components/Editor.js
View File

@ -216,6 +216,8 @@ function Editor({
const onSDKRequestEditRights = async () => { const onSDKRequestEditRights = async () => {
console.log("ONLYOFFICE Document Editor requests editing rights"); console.log("ONLYOFFICE Document Editor requests editing rights");
const url = window.location.href;
const index = url.indexOf("&action=view"); const index = url.indexOf("&action=view");
if (index) { if (index) {
@ -233,6 +235,8 @@ function Editor({
}; };
const onMakeActionLink = (event) => { const onMakeActionLink = (event) => {
const url = window.location.href;
const actionData = event.data; const actionData = event.data;
const link = generateLink(actionData); const link = generateLink(actionData);
@ -370,33 +374,33 @@ function Editor({
assign(window, ["ASC", "Files", "Editor", "docEditor"], docEditor); //Do not remove: it's for Back button on Mobile App assign(window, ["ASC", "Files", "Editor", "docEditor"], docEditor); //Do not remove: it's for Back button on Mobile App
}; };
const updateFavorite = (favorite) => { // const updateFavorite = (favorite) => {
docEditor.setFavorite(favorite); // docEditor.setFavorite(favorite);
}; // };
const onMetaChange = (event) => { const onMetaChange = (event) => {
const newTitle = event.data.title; const newTitle = event.data.title;
const favorite = event.data.favorite; //const favorite = event.data.favorite;
if (newTitle && newTitle !== docTitle) { if (newTitle && newTitle !== docTitle) {
setDocumentTitle(newTitle); setDocumentTitle(newTitle);
docTitle = newTitle; docTitle = newTitle;
} }
if (!newTitle) { // if (!newTitle) {
const onlyNumbers = new RegExp("^[0-9]+$"); // const onlyNumbers = new RegExp("^[0-9]+$");
const isFileWithoutProvider = onlyNumbers.test(fileId); // const isFileWithoutProvider = onlyNumbers.test(fileId);
const convertFileId = isFileWithoutProvider ? +fileId : fileId; // const convertFileId = isFileWithoutProvider ? +fileId : fileId;
favorite // favorite
? markAsFavorite([convertFileId]) // ? markAsFavorite([convertFileId])
.then(() => updateFavorite(favorite)) // .then(() => updateFavorite(favorite))
.catch((error) => console.log("error", error)) // .catch((error) => console.log("error", error))
: removeFromFavorite([convertFileId]) // : removeFromFavorite([convertFileId])
.then(() => updateFavorite(favorite)) // .then(() => updateFavorite(favorite))
.catch((error) => console.log("error", error)); // .catch((error) => console.log("error", error));
} // }
}; };
const setDocumentTitle = (subTitle = null) => { const setDocumentTitle = (subTitle = null) => {
@ -417,6 +421,10 @@ function Editor({
} else { } else {
title = organizationName; title = organizationName;
} }
if (!documentIsReady) {
docTitle = title;
}
document.title = title; document.title = title;
}; };
@ -441,8 +449,10 @@ function Editor({
if (index > -1) { if (index > -1) {
const splitUrl = url.split("#message/"); const splitUrl = url.split("#message/");
if (splitUrl.length === 2) { if (splitUrl.length === 2) {
const message = decodeURIComponent(raw).replace(/\+/g, " "); const message = decodeURIComponent(splitUrl[1]).replace(/\+/g, " ");
docEditor.showMessage(message); docEditor.showMessage(message);
history.pushState({}, null, url.substring(0, index)); history.pushState({}, null, url.substring(0, index));
} else { } else {
@ -528,7 +538,8 @@ function Editor({
onRequestInsertImage, onRequestInsertImage,
onRequestMailMergeRecipients, onRequestMailMergeRecipients,
onRequestCompareFile, onRequestCompareFile,
onRequestRestore; onRequestRestore,
onRequestHistory;
// if (isSharingAccess) { // if (isSharingAccess) {
// onRequestSharingSettings = onSDKRequestSharingSettings; // onRequestSharingSettings = onSDKRequestSharingSettings;
@ -538,6 +549,10 @@ function Editor({
onRequestRename = onSDKRequestRename; onRequestRename = onSDKRequestRename;
} }
if (userAccessRights.viewVersionHistory) {
onRequestHistory = onSDKRequestHistory;
}
if (successAuth && !user.isVisitor) { if (successAuth && !user.isVisitor) {
onRequestSaveAs = onSDKRequestSaveAs; onRequestSaveAs = onSDKRequestSaveAs;
} }
@ -569,7 +584,7 @@ function Editor({
onRequestMailMergeRecipients, onRequestMailMergeRecipients,
onRequestCompareFile, onRequestCompareFile,
onRequestEditRights: onSDKRequestEditRights, onRequestEditRights: onSDKRequestEditRights,
onRequestHistory: onSDKRequestHistory, onRequestHistory: onRequestHistory,
onRequestHistoryClose: onSDKRequestHistoryClose, onRequestHistoryClose: onSDKRequestHistoryClose,
onRequestHistoryData: onSDKRequestHistoryData, onRequestHistoryData: onSDKRequestHistoryData,
onRequestRestore, onRequestRestore,