Merge pull request #925 from ONLYOFFICE/feature/fix-bug-reactjs
Feature/fix bug reactjs
This commit is contained in:
maxkadushkin
GitHub
commit
0991b8dbdb
|
|
@ -212,6 +212,8 @@
|
|||
|
||||
.dialog.modal-in {
|
||||
z-index: 14000;
|
||||
max-height: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.dialog-backdrop.backdrop-in {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Main" : {
|
||||
"Main": {
|
||||
"SDK": {
|
||||
"Series": "Series",
|
||||
"Diagram Title": "Chart Title",
|
||||
|
|
@ -47,12 +47,10 @@
|
|||
"textPaidFeature": "Paid feature",
|
||||
"textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader. Please contact our Sales Department to get a quote.",
|
||||
"textClose": "Close",
|
||||
|
||||
"errorProcessSaveResult": "Saving is failed.",
|
||||
"criticalErrorTitle": "Error",
|
||||
"warnProcessRightsChange": "You have been denied the right to edit the file.",
|
||||
"errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
|
||||
|
||||
"errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
|
||||
"titleUpdateVersion": "Version changed",
|
||||
"textHasMacros": "The file contains automatic macros.<br>Do you want to run macros?",
|
||||
|
|
@ -468,7 +466,7 @@
|
|||
"textCancel": "Cancel",
|
||||
"textPictureFromLibrary": "Picture from Library",
|
||||
"textPictureFromURL": "Picture from URL",
|
||||
"textLinkSettings": "LinkSettings",
|
||||
"textLinkSettings": "Link Settings",
|
||||
"textBack": "Back",
|
||||
"textEmptyImgUrl": "You need to specify image URL.",
|
||||
"txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
|
||||
|
|
|
|||
|
|
@ -204,8 +204,8 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
|
|||
if (id === Asc.c_oAscError.ID.Warning && btn === 'ok' && (storeAppOptions.canDownload || storeAppOptions.canDownloadOrigin)) {
|
||||
api.asc_DownloadOrigin();
|
||||
} else if(id === Asc.c_oAscError.ID.SplitCellMaxRows ||
|
||||
Asc.c_oAscError.ID.SplitCellMaxCols ||
|
||||
Asc.c_oAscError.ID.SplitCellRowsDivider && btn === 'ok' && (storeAppOptions.canDownload || storeAppOptions.canDownloadOrigin)) {
|
||||
id === Asc.c_oAscError.ID.SplitCellMaxCols ||
|
||||
id === Asc.c_oAscError.ID.SplitCellRowsDivider) {
|
||||
Common.Notifications.trigger('showSplitModal',true);
|
||||
}
|
||||
storeAppOptions.changeEditingRights(false);
|
||||
|
|
|
|||
|
|
@ -76,30 +76,36 @@ const AddLayoutContent = ({ tabs }) => {
|
|||
)
|
||||
};
|
||||
|
||||
const AddTabs = props => {
|
||||
const AddTabs = inject("storeFocusObjects")(observer(({storeFocusObjects, showPanels, style, inPopover}) => {
|
||||
const { t } = useTranslation();
|
||||
const _t = t('Add', {returnObjects: true});
|
||||
const showPanels = props.showPanels;
|
||||
const tabs = [];
|
||||
if (!showPanels) {
|
||||
const options = storeFocusObjects.settings;
|
||||
if (!showPanels && options.indexOf('text') > -1) {
|
||||
tabs.push({
|
||||
caption: _t.textTable,
|
||||
id: 'add-table',
|
||||
icon: 'icon-add-table',
|
||||
component: <AddTableController/>
|
||||
});
|
||||
}
|
||||
if(!showPanels) {
|
||||
tabs.push({
|
||||
caption: _t.textShape,
|
||||
id: 'add-shape',
|
||||
icon: 'icon-add-shape',
|
||||
component: <AddShapeController/>
|
||||
});
|
||||
}
|
||||
if(!showPanels) {
|
||||
tabs.push({
|
||||
caption: _t.textImage,
|
||||
id: 'add-image',
|
||||
icon: 'icon-add-image',
|
||||
component: <AddImageController/>
|
||||
});
|
||||
}
|
||||
if(!showPanels) {
|
||||
tabs.push({
|
||||
caption: _t.textOther,
|
||||
id: 'add-other',
|
||||
|
|
@ -115,14 +121,14 @@ const AddTabs = props => {
|
|||
});
|
||||
}
|
||||
return (
|
||||
<View style={props.style} stackPages={true} routes={routes}>
|
||||
<View style={style} stackPages={true} routes={routes}>
|
||||
<Page pageContent={false}>
|
||||
<AddLayoutNavbar tabs={tabs} inPopover={props.inPopover}/>
|
||||
<AddLayoutNavbar tabs={tabs} inPopover={inPopover}/>
|
||||
<AddLayoutContent tabs={tabs} />
|
||||
</Page>
|
||||
</View>
|
||||
)
|
||||
};
|
||||
}));
|
||||
|
||||
class AddView extends Component {
|
||||
constructor(props) {
|
||||
|
|
|
|||
|
|
@ -153,25 +153,32 @@ const PageFootnote = props => {
|
|||
const AddOther = props => {
|
||||
const { t } = useTranslation();
|
||||
const _t = t('Add', {returnObjects: true});
|
||||
|
||||
const storeFocusObjects = props.storeFocusObjects;
|
||||
let isShape = storeFocusObjects.settings.indexOf('shape') > -1,
|
||||
isText = storeFocusObjects.settings.indexOf('text') > -1,
|
||||
isChart = storeFocusObjects.settings.indexOf('chart') > -1;
|
||||
|
||||
return (
|
||||
<List>
|
||||
<ListItem title={_t.textComment} onClick={() => {
|
||||
{isText &&<ListItem title={_t.textComment} onClick={() => {
|
||||
props.closeModal();
|
||||
Common.Notifications.trigger('addcomment');
|
||||
}}>
|
||||
<Icon slot="media" icon="icon-insert-comment"></Icon>
|
||||
</ListItem>
|
||||
<ListItem title={_t.textLink} link={'/add-link/'} routeProps={{
|
||||
</ListItem>}
|
||||
{isText && <ListItem title={_t.textLink} link={'/add-link/'} routeProps={{
|
||||
onInsertLink: props.onInsertLink,
|
||||
getDisplayLinkText: props.getDisplayLinkText
|
||||
}}>
|
||||
<Icon slot="media" icon="icon-link"></Icon>
|
||||
</ListItem>
|
||||
</ListItem>}
|
||||
<ListItem title={_t.textPageNumber} link={'/add-page-number/'} routeProps={{
|
||||
onInsertPageNumber: props.onInsertPageNumber
|
||||
}}>
|
||||
<Icon slot="media" icon="icon-pagenumber"></Icon>
|
||||
</ListItem>
|
||||
{(isShape || isChart) ? null :
|
||||
<ListItem title={_t.textBreak} link={'/add-break/'} routeProps={{
|
||||
onPageBreak: props.onPageBreak,
|
||||
onColumnBreak: props.onColumnBreak,
|
||||
|
|
@ -179,6 +186,8 @@ const AddOther = props => {
|
|||
}}>
|
||||
<Icon slot="media" icon="icon-sectionbreak"></Icon>
|
||||
</ListItem>
|
||||
}
|
||||
{(isShape || isChart) ? null :
|
||||
<ListItem title={_t.textFootnote} link={'/add-footnote/'} routeProps={{
|
||||
getFootnoteProps: props.getFootnoteProps,
|
||||
getFootnoteStartAt: props.getFootnoteStartAt,
|
||||
|
|
@ -187,12 +196,12 @@ const AddOther = props => {
|
|||
initFootnoteStartAt: props.initFootnoteStartAt
|
||||
}}>
|
||||
<Icon slot="media" icon="icon-footnote"></Icon>
|
||||
</ListItem>
|
||||
</ListItem>}
|
||||
</List>
|
||||
)
|
||||
};
|
||||
|
||||
const AddOtherContainer = inject("storeComments")(observer(AddOther));
|
||||
const AddOtherContainer = inject("storeComments","storeFocusObjects")(observer(AddOther));
|
||||
|
||||
export {AddOtherContainer as AddOther,
|
||||
PageNumber as PageAddNumber,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"Controller" : {
|
||||
"Main" : {
|
||||
"Controller": {
|
||||
"Main": {
|
||||
"SDK": {
|
||||
"Series": "Series",
|
||||
"Diagram Title": "Chart Title",
|
||||
|
|
@ -48,12 +48,10 @@
|
|||
"textPaidFeature": "Paid feature",
|
||||
"textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader. Please contact our Sales Department to get a quote.",
|
||||
"textClose": "Close",
|
||||
|
||||
"errorProcessSaveResult": "Saving is failed.",
|
||||
"criticalErrorTitle": "Error",
|
||||
"warnProcessRightsChange": "You have been denied the right to edit the file.",
|
||||
"errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
|
||||
|
||||
"errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
|
||||
"titleUpdateVersion": "Version changed",
|
||||
"textHasMacros": "The file contains automatic macros.<br>Do you want to run macros?",
|
||||
|
|
@ -219,7 +217,7 @@
|
|||
"textOther": "Other",
|
||||
"textPictureFromLibrary": "Picture from Library",
|
||||
"textPictureFromURL": "Picture from URL",
|
||||
"textLinkSettings": "LinkSettings",
|
||||
"textLinkSettings": "Link Settings",
|
||||
"textBack": "Back",
|
||||
"textEmptyImgUrl": "You need to specify image URL.",
|
||||
"txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
|
||||
|
|
|
|||
Loading…
Reference in a new issue