mirror of
https://github.com/ONLYOFFICE/web-apps.git
synced 2026-07-25 05:03:55 +08:00
Merge pull request #2518 from ONLYOFFICE/feature/fix-bugs
Feature/fix bugs
This commit is contained in:
maxkadushkin
@ -1,4 +1,5 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { Device } from '../../../../common/mobile/utils/device';
|
||||
import { inject, observer } from 'mobx-react';
|
||||
import { f7 } from 'framework7-react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
@ -206,8 +207,56 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto
|
||||
api.ChangeReaderMode();
|
||||
}
|
||||
|
||||
const changeTitleHandler = () => {
|
||||
f7.dialog.create({
|
||||
title: t('Toolbar.textRenameFile'),
|
||||
text : t('Toolbar.textEnterNewFileName'),
|
||||
content: Device.ios ?
|
||||
'<div class="input-field"><input type="text" class="modal-text-input" name="modal-title" id="modal-title"></div>' : '<div class="input-field modal-title"><div class="inputs-list list inline-labels"><ul><li><div class="item-content item-input"><div class="item-inner"><div class="item-input-wrap"><input type="text" name="modal-title" id="modal-title"></div></div></div></li></ul></div></div>',
|
||||
cssClass: 'dlg-adv-options',
|
||||
buttons: [
|
||||
{
|
||||
text: t('Edit.textCancel')
|
||||
},
|
||||
{
|
||||
text: t('Edit.textOk'),
|
||||
cssClass: 'btn-change-title',
|
||||
bold: true,
|
||||
close: false,
|
||||
onClick: () => {
|
||||
const titleFieldValue = document.querySelector('#modal-title').value;
|
||||
if(titleFieldValue.trim().length) {
|
||||
changeTitle(titleFieldValue);
|
||||
f7.dialog.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
on: {
|
||||
opened: () => {
|
||||
const nameDoc = docTitle.split('.')[0];
|
||||
const titleField = document.querySelector('#modal-title');
|
||||
const btnChangeTitle = document.querySelector('.btn-change-title');
|
||||
|
||||
titleField.value = nameDoc;
|
||||
titleField.focus();
|
||||
titleField.select();
|
||||
|
||||
titleField.addEventListener('input', () => {
|
||||
if(titleField.value.trim().length) {
|
||||
btnChangeTitle.classList.remove('disabled');
|
||||
} else {
|
||||
btnChangeTitle.classList.add('disabled');
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}).open();
|
||||
}
|
||||
|
||||
const changeTitle = (name) => {
|
||||
const api = Common.EditorApi.get();
|
||||
const storeDocumentInfo = props.storeDocumentInfo;
|
||||
const docInfo = storeDocumentInfo.docInfo;
|
||||
const title = `${name}.${docExt}`;
|
||||
|
||||
@ -246,7 +295,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto
|
||||
turnOnViewerMode={turnOnViewerMode}
|
||||
isMobileView={isMobileView}
|
||||
changeMobileView={changeMobileView}
|
||||
changeTitle={changeTitle}
|
||||
changeTitleHandler={changeTitleHandler}
|
||||
isVersionHistoryMode={isVersionHistoryMode}
|
||||
closeHistory={closeHistory}
|
||||
/>
|
||||
|
||||
@ -34,53 +34,6 @@ const ToolbarView = props => {
|
||||
}
|
||||
};
|
||||
|
||||
const changeTitleHandler = () => {
|
||||
f7.dialog.create({
|
||||
title: t('Toolbar.textRenameFile'),
|
||||
text : t('Toolbar.textEnterNewFileName'),
|
||||
content: Device.ios ?
|
||||
'<div class="input-field"><input type="text" class="modal-text-input" name="modal-title" id="modal-title"></div>' : '<div class="input-field modal-title"><div class="inputs-list list inline-labels"><ul><li><div class="item-content item-input"><div class="item-inner"><div class="item-input-wrap"><input type="text" name="modal-title" id="modal-title"></div></div></div></li></ul></div></div>',
|
||||
cssClass: 'dlg-adv-options',
|
||||
buttons: [
|
||||
{
|
||||
text: t('Edit.textCancel')
|
||||
},
|
||||
{
|
||||
text: t('Edit.textOk'),
|
||||
cssClass: 'btn-change-title',
|
||||
bold: true,
|
||||
close: false,
|
||||
onClick: () => {
|
||||
const titleFieldValue = document.querySelector('#modal-title').value;
|
||||
if(titleFieldValue.trim().length) {
|
||||
props.changeTitle(titleFieldValue);
|
||||
f7.dialog.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
on: {
|
||||
opened: () => {
|
||||
const nameDoc = docTitle.split('.')[0];
|
||||
const titleField = document.querySelector('#modal-title');
|
||||
const btnChangeTitle = document.querySelector('.btn-change-title');
|
||||
|
||||
titleField.value = nameDoc;
|
||||
titleField.focus();
|
||||
titleField.select();
|
||||
|
||||
titleField.addEventListener('input', () => {
|
||||
if(titleField.value.trim().length) {
|
||||
btnChangeTitle.classList.remove('disabled');
|
||||
} else {
|
||||
btnChangeTitle.classList.add('disabled');
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}).open();
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
const elemTitle = document.querySelector('.subnavbar .title');
|
||||
|
||||
@ -105,7 +58,7 @@ const ToolbarView = props => {
|
||||
onRedoClick: props.onRedo
|
||||
})}
|
||||
</NavLeft>
|
||||
{((!Device.phone || isViewer) && !isVersionHistoryMode) && <div className='title' onClick={changeTitleHandler} style={{width: '71%'}}>{docTitle}</div>}
|
||||
{((!Device.phone || isViewer) && !isVersionHistoryMode) && <div className='title' onClick={() => props.changeTitleHandler()} style={{width: '71%'}}>{docTitle}</div>}
|
||||
<NavRight>
|
||||
{(Device.android && props.isEdit && !isViewer && !isVersionHistoryMode) && EditorUIController.getUndoRedo && EditorUIController.getUndoRedo({
|
||||
disabledUndo: !props.isCanUndo,
|
||||
@ -127,7 +80,7 @@ const ToolbarView = props => {
|
||||
onAddClick: e => props.openOptions('add')
|
||||
})}
|
||||
{/*props.displayCollaboration &&*/}
|
||||
{Device.phone || isVersionHistoryMode ? null : <Link className={(props.disabledControls || props.readerMode) && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link>}
|
||||
{Device.phone ? null : <Link className={(props.disabledControls || props.readerMode) && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link>}
|
||||
{window.matchMedia("(min-width: 360px)").matches && docExt !== 'oform' && !isVersionHistoryMode ? <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={() => props.openOptions('coauth')}></Link> : null}
|
||||
{isVersionHistoryMode ? <Link id='btn-open-history' icon='icon-version-history' href={false} onClick={() => props.openOptions('history')}></Link> : null}
|
||||
<Link className={(props.disabledSettings || props.disabledControls || isDisconnected) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={() => props.openOptions('settings')}></Link>
|
||||
|
||||
@ -74,7 +74,7 @@ const ToolbarView = props => {
|
||||
onEditClick: () => props.openOptions('edit'),
|
||||
onAddClick: () => props.openOptions('add')
|
||||
})}
|
||||
{Device.phone || isVersionHistoryMode ? null : <Link className={(props.disabledControls || props.disabledPreview) && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link>}
|
||||
{Device.phone ? null : <Link className={(props.disabledControls || props.disabledPreview) && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link>}
|
||||
{props.displayCollaboration && window.matchMedia("(min-width: 375px)").matches && !isVersionHistoryMode ? <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={() => props.openOptions('coauth')}></Link> : null}
|
||||
{isVersionHistoryMode ? <Link id='btn-open-history' icon='icon-version-history' href={false} onClick={() => props.openOptions('history')}></Link> : null}
|
||||
<Link className={(props.disabledSettings || props.disabledControls || isDisconnected) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={() => props.openOptions('settings')}></Link>
|
||||
|
||||
@ -72,7 +72,7 @@ const ToolbarView = props => {
|
||||
onEditClick: () => props.openOptions('edit'),
|
||||
onAddClick: () => props.openOptions('add')
|
||||
})}
|
||||
{Device.phone || isVersionHistoryMode ? null : <Link className={(props.disabledControls || props.disabledSearch) && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link>}
|
||||
{Device.phone ? null : <Link className={(props.disabledControls || props.disabledSearch) && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link>}
|
||||
{props.displayCollaboration && window.matchMedia("(min-width: 360px)").matches && !isVersionHistoryMode ? <Link className={(props.disabledControls || props.disabledCollaboration) && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={() => props.openOptions('coauth')}></Link> : null}
|
||||
{isVersionHistoryMode ? <Link id='btn-open-history' icon='icon-version-history' href={false} onClick={() => props.openOptions('history')}></Link> : null}
|
||||
<Link className={(props.disabledSettings || props.disabledControls || isDisconnected) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={() => props.openOptions('settings')}></Link>
|
||||
|
||||
Reference in New Issue
Block a user