Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE PE mobile] Changes for private branch

Browse source
This commit is contained in:
JuliaSvinareva 2021-04-16 19:03:30 +03:00
parent fe1a9e16d3
commit 45a9058da4
6 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/documenteditor/mobile/src/controller/ContextMenu.jsx
View file

@ -65,7 +65,7 @@ class ContextMenu extends ContextMenuController {
onMenuItemClick(action) { onMenuItemClick(action) {
super.onMenuItemClick(action); super.onMenuItemClick(action);
if ( EditorUIController.ContextMenu.handleMenuItemClick(this, action) ) if ( EditorUIController.ContextMenu && EditorUIController.ContextMenu.handleMenuItemClick(this, action) )
return; return;
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
@ -205,7 +205,7 @@ class ContextMenu extends ContextMenuController {
if ( !Common.EditorApi ) return []; if ( !Common.EditorApi ) return [];
const { isEdit } = this.props; const { isEdit } = this.props;
if (isEdit) { if (isEdit && EditorUIController.ContextMenu) {
return EditorUIController.ContextMenu.mapMenuItems(this); return EditorUIController.ContextMenu.mapMenuItems(this);
} else { } else {
const { t } = this.props; const { t } = this.props;

25
apps/documenteditor/mobile/src/controller/Main.jsx
View file

@ -9,8 +9,6 @@ import {InitReviewController as ReviewController} from '../../../../common/mobil
import { onAdvancedOptions } from './settings/Download.jsx'; import { onAdvancedOptions } from './settings/Download.jsx';
import { import {
CommentsController, CommentsController,
AddCommentController,
EditCommentController,
ViewCommentsController ViewCommentsController
} from "../../../../common/mobile/lib/controller/collaboration/Comments"; } from "../../../../common/mobile/lib/controller/collaboration/Comments";
import About from '../../../../common/mobile/lib/view/About'; import About from '../../../../common/mobile/lib/view/About';
@ -488,9 +486,7 @@ class MainController extends Component {
this.api.asc_registerCallback('asc_onDocumentName', this.onDocumentName.bind(this)); this.api.asc_registerCallback('asc_onDocumentName', this.onDocumentName.bind(this));
this.api.asc_registerCallback('asc_onPrintUrl', this.onPrintUrl.bind(this)); this.api.asc_registerCallback('asc_onPrintUrl', this.onPrintUrl.bind(this));
this.api.asc_registerCallback('asc_onSendThemeColors', (colors, standart_colors) => { EditorUIController.initThemeColors && EditorUIController.initThemeColors();
Common.Utils.ThemeColor.setColors(colors, standart_colors);
});
this.api.asc_registerCallback('asc_onDownloadUrl', this.onDownloadUrl.bind(this)); this.api.asc_registerCallback('asc_onDownloadUrl', this.onDownloadUrl.bind(this));
@ -504,8 +500,8 @@ class MainController extends Component {
//text settings //text settings
const storeTextSettings = this.props.storeTextSettings; const storeTextSettings = this.props.storeTextSettings;
EditorUIController.initFonts(storeTextSettings); EditorUIController.initFonts && EditorUIController.initFonts(storeTextSettings);
EditorUIController.initFocusObjects(this.props.storeFocusObjects); EditorUIController.initFocusObjects && EditorUIController.initFocusObjects(this.props.storeFocusObjects);
this.api.asc_registerCallback('asc_onVerticalAlign', (typeBaseline) => { this.api.asc_registerCallback('asc_onVerticalAlign', (typeBaseline) => {
storeTextSettings.resetTypeBaseline(typeBaseline); storeTextSettings.resetTypeBaseline(typeBaseline);
@ -543,19 +539,13 @@ class MainController extends Component {
}); });
//paragraph settings //paragraph settings
EditorUIController.initEditorStyles(this.props.storeParagraphSettings); EditorUIController.initEditorStyles && EditorUIController.initEditorStyles(this.props.storeParagraphSettings);
//table settings //table settings
EditorUIController.initTableTemplates(this.props.storeTableSettings); EditorUIController.initTableTemplates && EditorUIController.initTableTemplates(this.props.storeTableSettings);
//chart settings //chart settings
const storeChartSettings = this.props.storeChartSettings; EditorUIController.updateChartStyles && EditorUIController.updateChartStyles(this.props.storeChartSettings, this.props.storeFocusObjects);
const storeFocusObjects = this.props.storeFocusObjects;
this.api.asc_registerCallback('asc_onUpdateChartStyles', () => {
if (storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties()) {
storeChartSettings.updateChartStyles(this.api.asc_getChartPreviews(storeFocusObjects.chartObject.get_ChartProperties().getType()));
}
});
// Document Info // Document Info
@ -782,8 +772,7 @@ class MainController extends Component {
<CollaborationController /> <CollaborationController />
<ReviewController /> <ReviewController />
<CommentsController /> <CommentsController />
<AddCommentController /> {EditorUIController.getEditCommentControllers && EditorUIController.getEditCommentControllers()}
<EditCommentController />
<ViewCommentsController /> <ViewCommentsController />
</Fragment> </Fragment>
) )

4
apps/documenteditor/mobile/src/view/Toolbar.jsx
View file

@ -9,7 +9,7 @@ const ToolbarView = props => {
<Fragment> <Fragment>
<NavLeft> <NavLeft>
{props.isShowBack && <Link className={`btn-doc-back${props.disabledControls && ' disabled'}`} icon='icon-back' onClick={props.onBack}></Link>} {props.isShowBack && <Link className={`btn-doc-back${props.disabledControls && ' disabled'}`} icon='icon-back' onClick={props.onBack}></Link>}
{props.isEdit && EditorUIController.getUndoRedo({ {props.isEdit && EditorUIController.getUndoRedo && EditorUIController.getUndoRedo({
disabledUndo: !props.isCanUndo, disabledUndo: !props.isCanUndo,
disabledRedo: !props.isCanRedo, disabledRedo: !props.isCanRedo,
onUndoClick: props.onUndo, onUndoClick: props.onUndo,
@ -18,7 +18,7 @@ const ToolbarView = props => {
</NavLeft> </NavLeft>
{!Device.phone && <NavTitle>{props.docTitle}</NavTitle>} {!Device.phone && <NavTitle>{props.docTitle}</NavTitle>}
<NavRight> <NavRight>
{props.isEdit && EditorUIController.getToolbarOptions({ {props.isEdit && EditorUIController.getToolbarOptions && EditorUIController.getToolbarOptions({
disabled: disableEditBtn || props.disabledControls, disabled: disableEditBtn || props.disabledControls,
onEditClick: e => props.openOptions('edit'), onEditClick: e => props.openOptions('edit'),
onAddClick: e => props.openOptions('add') onAddClick: e => props.openOptions('add')

4
apps/presentationeditor/mobile/src/controller/ContextMenu.jsx
View file

@ -58,7 +58,7 @@ class ContextMenu extends ContextMenuController {
onMenuItemClick(action) { onMenuItemClick(action) {
super.onMenuItemClick(action); super.onMenuItemClick(action);
if ( EditorUIController.ContextMenu.handleMenuItemClick(this, action) ) if ( EditorUIController.ContextMenu && EditorUIController.ContextMenu.handleMenuItemClick(this, action) )
return; return;
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
@ -142,7 +142,7 @@ class ContextMenu extends ContextMenuController {
const { isEdit } = this.props; const { isEdit } = this.props;
if (isEdit) { if (isEdit && EditorUIController.ContextMenu) {
return EditorUIController.ContextMenu.mapMenuItems(this); return EditorUIController.ContextMenu.mapMenuItems(this);
} else { } else {
const { t } = this.props; const { t } = this.props;

21
apps/presentationeditor/mobile/src/controller/Main.jsx
View file

@ -180,6 +180,8 @@ class MainController extends Component {
this.api.asc_registerCallback('asc_onDocumentContentReady', this._onDocumentContentReady.bind(this)); this.api.asc_registerCallback('asc_onDocumentContentReady', this._onDocumentContentReady.bind(this));
this.api.asc_registerCallback('asc_onOpenDocumentProgress', this._onOpenDocumentProgress.bind(this)); this.api.asc_registerCallback('asc_onOpenDocumentProgress', this._onOpenDocumentProgress.bind(this));
EditorUIController.initThemeColors && EditorUIController.initThemeColors();
const storePresentationSettings = this.props.storePresentationSettings; const storePresentationSettings = this.props.storePresentationSettings;
this.api.asc_registerCallback('asc_onPresentationSize', (width, height) => { this.api.asc_registerCallback('asc_onPresentationSize', (width, height) => {
@ -190,15 +192,15 @@ class MainController extends Component {
storePresentationSettings.addSchemes(arr); storePresentationSettings.addSchemes(arr);
}); });
EditorUIController.initFocusObjects(this.props.storeFocusObjects); EditorUIController.initFocusObjects && EditorUIController.initFocusObjects(this.props.storeFocusObjects);
EditorUIController.initEditorStyles(this.props.storeSlideSettings); EditorUIController.initEditorStyles && EditorUIController.initEditorStyles(this.props.storeSlideSettings);
// Text settings // Text settings
const storeTextSettings = this.props.storeTextSettings; const storeTextSettings = this.props.storeTextSettings;
EditorUIController.initFonts(storeTextSettings); EditorUIController.initFonts && EditorUIController.initFonts(storeTextSettings);
this.api.asc_registerCallback('asc_onVerticalAlign', (typeBaseline) => { this.api.asc_registerCallback('asc_onVerticalAlign', (typeBaseline) => {
storeTextSettings.resetTypeBaseline(typeBaseline); storeTextSettings.resetTypeBaseline(typeBaseline);
@ -257,17 +259,11 @@ class MainController extends Component {
// Table settings // Table settings
EditorUIController.initTableTemplates(this.props.storeTableSettings); EditorUIController.initTableTemplates && EditorUIController.initTableTemplates(this.props.storeTableSettings);
// Chart settings // Chart settings
const storeChartSettings = this.props.storeChartSettings; EditorUIController.updateChartStyles && EditorUIController.updateChartStyles(this.props.storeChartSettings, this.props.storeFocusObjects);
this.api.asc_registerCallback('asc_onUpdateChartStyles', () => {
if (storeFocusObjects.chartObject) {
storeChartSettings.updateChartStyles(this.api.asc_getChartPreviews(storeFocusObjects.chartObject.getType()));
}
});
} }
_onDocumentContentReady() { _onDocumentContentReady() {
@ -304,8 +300,7 @@ class MainController extends Component {
<Fragment> <Fragment>
<CollaborationController /> <CollaborationController />
<CommentsController /> <CommentsController />
<AddCommentController /> {EditorUIController.getEditCommentControllers && EditorUIController.getEditCommentControllers()}
<EditCommentController />
<ViewCommentsController /> <ViewCommentsController />
</Fragment> </Fragment>
) )

4
apps/presentationeditor/mobile/src/view/Toolbar.jsx
View file

@ -8,7 +8,7 @@ const ToolbarView = props => {
<Fragment> <Fragment>
<NavLeft> <NavLeft>
{props.isShowBack && <Link className={`btn-doc-back${props.disabledControls && ' disabled'}`} icon='icon-back' onClick={props.onBack}></Link>} {props.isShowBack && <Link className={`btn-doc-back${props.disabledControls && ' disabled'}`} icon='icon-back' onClick={props.onBack}></Link>}
{props.isEdit && EditorUIController.getUndoRedo({ {props.isEdit && EditorUIController.getUndoRedo && EditorUIController.getUndoRedo({
disabledUndo: !props.isCanUndo, disabledUndo: !props.isCanUndo,
disabledRedo: !props.isCanRedo, disabledRedo: !props.isCanRedo,
onUndoClick: props.onUndo, onUndoClick: props.onUndo,
@ -18,7 +18,7 @@ const ToolbarView = props => {
{!Device.phone && <NavTitle>{props.docTitle}</NavTitle>} {!Device.phone && <NavTitle>{props.docTitle}</NavTitle>}
<NavRight> <NavRight>
<Link className={(props.disabledControls || props.disabledPreview) && 'disabled'} icon='icon-play' href={false} onClick={() => {props.openOptions('preview')}}></Link> <Link className={(props.disabledControls || props.disabledPreview) && 'disabled'} icon='icon-play' href={false} onClick={() => {props.openOptions('preview')}}></Link>
{props.isEdit && EditorUIController.getToolbarOptions({ {props.isEdit && EditorUIController.getToolbarOptions && EditorUIController.getToolbarOptions({
disabledAdd: props.disabledAdd || props.disabledControls, disabledAdd: props.disabledAdd || props.disabledControls,
disabledEdit: props.disabledEdit || props.disabledControls, disabledEdit: props.disabledEdit || props.disabledControls,
onEditClick: () => props.openOptions('edit'), onEditClick: () => props.openOptions('edit'),