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

[PE mobile] Changes after merge

Browse source
This commit is contained in:
SergeyEzhin 2021-01-29 12:04:28 +03:00
parent 2c6c3c3a71
commit 338776c1a0
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,11 +5,7 @@ import { f7 } from "framework7-react";
import { withTranslation } from 'react-i18next'; import { withTranslation } from 'react-i18next';
import CollaborationController from '../../../../common/mobile/lib/controller/Collaboration.jsx' import CollaborationController from '../../../../common/mobile/lib/controller/Collaboration.jsx'
<<<<<<< HEAD
@inject("storeFocusObjects", "storeAppOptions", "storePresentationInfo", "storePresentationSettings", "storeSlideSettings", "storeTextSettings", "storeTableSettings", "storeChartSettings") @inject("storeFocusObjects", "storeAppOptions", "storePresentationInfo", "storePresentationSettings", "storeSlideSettings", "storeTextSettings", "storeTableSettings", "storeChartSettings")
=======
@inject("storeFocusObjects", "storeAppOptions", "storePresentationInfo", "storePresentationSettings", "storeSlideSettings", "storeTextSettings", "storeTableSettings", "storeLinkSettings")
>>>>>>> feature/mobile-apps-on-reactjs
class MainController extends Component { class MainController extends Component {
constructor(props) { constructor(props) {
super(props) super(props)

5
apps/presentationeditor/mobile/src/store/mainStore.js
View file

@ -12,7 +12,7 @@ import { storeTextSettings } from './textSettings';
import { storeShapeSettings } from './shapeSettings'; import { storeShapeSettings } from './shapeSettings';
import { storeTableSettings } from "./tableSettings"; import { storeTableSettings } from "./tableSettings";
import { storeChartSettings } from "./chartSettings"; import { storeChartSettings } from "./chartSettings";
// import {storeTextSettings} from "./textSettings"; import { storeLinkSettings } from "./linkSettings";
// import {storeParagraphSettings} from "./paragraphSettings"; // import {storeParagraphSettings} from "./paragraphSettings";
// import {storeShapeSettings} from "./shapeSettings"; // import {storeShapeSettings} from "./shapeSettings";
// import {storeImageSettings} from "./imageSettings"; // import {storeImageSettings} from "./imageSettings";
@ -30,7 +30,8 @@ export const stores = {
storeTextSettings: new storeTextSettings(), storeTextSettings: new storeTextSettings(),
storeShapeSettings: new storeShapeSettings(), storeShapeSettings: new storeShapeSettings(),
storeTableSettings: new storeTableSettings(), storeTableSettings: new storeTableSettings(),
storeChartSettings: new storeChartSettings() storeChartSettings: new storeChartSettings(),
storeLinkSettings: new storeLinkSettings()
// storeTextSettings: new storeTextSettings(), // storeTextSettings: new storeTextSettings(),
// storeParagraphSettings: new storeParagraphSettings(), // storeParagraphSettings: new storeParagraphSettings(),
// storeShapeSettings: new storeShapeSettings(), // storeShapeSettings: new storeShapeSettings(),