From dc4c20081bf4a48800de61b7b1a18dade24a18ac Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 3 Apr 2021 18:38:32 +0300 Subject: [PATCH] [DE mobile] extended controller for private functions --- apps/documenteditor/mobile/src/controller/Main.jsx | 5 ++--- apps/documenteditor/mobile/src/lib/patch.jsx | 10 +++++++--- apps/documenteditor/mobile/src/view/Toolbar.jsx | 10 ++++++++-- vendor/framework7-react/build/webpack.config.js | 2 ++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index 540ca4398..477467c3d 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -13,8 +13,7 @@ import { EditCommentController, ViewCommentsController } from "../../../../common/mobile/lib/controller/collaboration/Comments"; - -import patch from '../lib/patch' +import EditorUIController from '../lib/patch' @inject( "storeAppOptions", @@ -59,7 +58,7 @@ class MainController extends Component { }; const loadConfig = data => { - patch.isSupportEditFeature(); + EditorUIController.isSupportEditFeature(); console.log('load config'); this.editorConfig = Object.assign({}, this.editorConfig, data.config); diff --git a/apps/documenteditor/mobile/src/lib/patch.jsx b/apps/documenteditor/mobile/src/lib/patch.jsx index 89603acd7..c6788a651 100644 --- a/apps/documenteditor/mobile/src/lib/patch.jsx +++ b/apps/documenteditor/mobile/src/lib/patch.jsx @@ -1,10 +1,14 @@ -const patch = () => { +const EditorUIController = () => { return null }; -patch.isSupportEditFeature = () => { +EditorUIController.isSupportEditFeature = () => { return false }; -export default patch; +EditorUIController.getToolbarOptions = () => { + return null +}; + +export default EditorUIController; diff --git a/apps/documenteditor/mobile/src/view/Toolbar.jsx b/apps/documenteditor/mobile/src/view/Toolbar.jsx index 782b1924c..ff57d327f 100644 --- a/apps/documenteditor/mobile/src/view/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/view/Toolbar.jsx @@ -1,6 +1,7 @@ import React, {Fragment} from 'react'; import {NavLeft, NavRight, NavTitle, Link, Icon} from 'framework7-react'; import { Device } from '../../../../common/mobile/utils/device'; +import EditorUIController from '../lib/patch' const ToolbarView = props => { const disableEditBtn = props.isObjectLocked || props.stateDisplayMode || props.disabledEditControls; @@ -13,8 +14,13 @@ const ToolbarView = props => { {!Device.phone && {props.docTitle}} - props.openOptions('edit')}> - props.openOptions('add')}> + { + EditorUIController.getToolbarOptions({ + disabled: disableEditBtn, + onEditClick: e => props.openOptions('edit'), + onAddClick: e => props.openOptions('add'), + }) + } { Device.phone ? null : } {props.displayCollaboration && props.openOptions('coauth')}>} props.openOptions('settings')}> diff --git a/vendor/framework7-react/build/webpack.config.js b/vendor/framework7-react/build/webpack.config.js index ea3bc262f..45280395a 100644 --- a/vendor/framework7-react/build/webpack.config.js +++ b/vendor/framework7-react/build/webpack.config.js @@ -77,6 +77,8 @@ module.exports = { resolvePath('node_modules/template7'), resolvePath('node_modules/dom7'), resolvePath('node_modules/ssr-window'), + + resolvePath('../../../web-apps-mobile/word'), ], },