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

Сode refactoring

Browse source
This commit is contained in:
Andrey 2021-06-07 21:36:41 +03:00
parent d57cfedc77
commit f2f0feda8d
2 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/documenteditor/mobile/src/view/edit/Edit.jsx
View file

@ -14,7 +14,7 @@ import EditChartController from "../../controller/edit/EditChart";
import EditHyperlinkController from "../../controller/edit/EditHyperlink"; import EditHyperlinkController from "../../controller/edit/EditHyperlink";
import EditHeaderController from "../../controller/edit/EditHeader"; import EditHeaderController from "../../controller/edit/EditHeader";
import {PageTextFonts, PageTextAddFormatting, PageTextBullets, PageTextNumbers, PageTextBulletsAndNumbers, PageTextLineSpacing, PageTextFontColor, PageTextCustomFontColor, PageTextBackgroundColor, PageTextCustomBackColor} from "./EditText"; import {PageTextFonts, PageTextAddFormatting, PageTextBulletsAndNumbers, PageTextLineSpacing, PageTextFontColor, PageTextCustomFontColor, PageTextBackgroundColor, PageTextCustomBackColor} from "./EditText";
import {ParagraphAdvSettings, PageParagraphBackColor, PageParagraphCustomColor} from "./EditParagraph"; import {ParagraphAdvSettings, PageParagraphBackColor, PageParagraphCustomColor} from "./EditParagraph";
import {PageShapeStyleNoFill, PageShapeStyle, PageShapeCustomFillColor, PageShapeBorderColor, PageShapeCustomBorderColor, PageWrap, PageReorder, PageReplace} from "./EditShape"; import {PageShapeStyleNoFill, PageShapeStyle, PageShapeCustomFillColor, PageShapeBorderColor, PageShapeCustomBorderColor, PageWrap, PageReorder, PageReplace} from "./EditShape";
import {PageImageReorder, PageImageReplace, PageImageWrap, PageLinkSettings} from "./EditImage"; import {PageImageReorder, PageImageReplace, PageImageWrap, PageLinkSettings} from "./EditImage";
@ -31,14 +31,6 @@ const routes = [
path: '/edit-text-add-formatting/', path: '/edit-text-add-formatting/',
component: PageTextAddFormatting, component: PageTextAddFormatting,
}, },
{
path: '/edit-text-bullets/',
component: PageTextBullets,
},
{
path: '/edit-text-numbers/',
component: PageTextNumbers,
},
{ {
path: '/edit-bullets-and-numbers/', path: '/edit-bullets-and-numbers/',
component: PageTextBulletsAndNumbers, component: PageTextBulletsAndNumbers,

6
apps/documenteditor/mobile/src/view/edit/EditText.jsx
View file

@ -165,7 +165,6 @@ const PageBullets = props => {
onClick={() => { onClick={() => {
if (bullet.type === -1) { if (bullet.type === -1) {
storeTextSettings.resetBullets(-1); storeTextSettings.resetBullets(-1);
props.f7router.back();
} }
props.onBullet(bullet.type) props.onBullet(bullet.type)
props.f7router.back(); props.f7router.back();
@ -213,7 +212,6 @@ const PageNumbers = props => {
onClick={() => { onClick={() => {
if (number.type === -1) { if (number.type === -1) {
storeTextSettings.resetNumbers(-1); storeTextSettings.resetNumbers(-1);
props.f7router.back();
} }
props.onNumber(number.type) props.onNumber(number.type)
props.f7router.back(); props.f7router.back();
@ -575,8 +573,6 @@ const EditText = props => {
const EditTextContainer = inject("storeTextSettings", "storeFocusObjects")(observer(EditText)); const EditTextContainer = inject("storeTextSettings", "storeFocusObjects")(observer(EditText));
const PageTextFonts = inject("storeTextSettings", "storeFocusObjects")(observer(PageFonts)); const PageTextFonts = inject("storeTextSettings", "storeFocusObjects")(observer(PageFonts));
const PageTextAddFormatting = inject("storeTextSettings", "storeFocusObjects")(observer(PageAdditionalFormatting)); const PageTextAddFormatting = inject("storeTextSettings", "storeFocusObjects")(observer(PageAdditionalFormatting));
const PageTextBullets = inject("storeTextSettings")(observer(PageBullets));
const PageTextNumbers = inject("storeTextSettings")(observer(PageNumbers));
const PageTextBulletsAndNumbers = inject("storeTextSettings")(observer(PageBulletsAndNumbers)); const PageTextBulletsAndNumbers = inject("storeTextSettings")(observer(PageBulletsAndNumbers));
const PageTextLineSpacing = inject("storeTextSettings")(observer(PageLineSpacing)); const PageTextLineSpacing = inject("storeTextSettings")(observer(PageLineSpacing));
const PageTextFontColor = inject("storeTextSettings", "storePalette")(observer(PageFontColor)); const PageTextFontColor = inject("storeTextSettings", "storePalette")(observer(PageFontColor));
@ -589,8 +585,6 @@ export {
EditTextContainer as EditText, EditTextContainer as EditText,
PageTextFonts, PageTextFonts,
PageTextAddFormatting, PageTextAddFormatting,
PageTextBullets,
PageTextNumbers,
PageTextBulletsAndNumbers, PageTextBulletsAndNumbers,
PageTextLineSpacing, PageTextLineSpacing,
PageTextFontColor, PageTextFontColor,