pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 10:59:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'feature/reset-background' (#648) from feature/reset-background into develop

Browse Source
This commit is contained in:
Julia Radzhabova
2025-08-28 19:00:51 +00:00
parent 33becbde04 486cc79fa8
commit c2ce352936
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/presentationeditor/mobile/locale/en.json
View File

@ -466,6 +466,8 @@
"textSec": "s",
"textSelectObjectToEdit": "Select object to edit",
"textSendToBackground": "Send to Background",
"textBackground": "Background",
"textResetBackground": "Reset background",
"textShape": "Shape",
"textSize": "Size",
"textSlide": "Slide",

8
apps/presentationeditor/mobile/src/controller/edit/EditSlide.jsx
View File

@ -140,6 +140,13 @@ class EditSlideController extends Component {
this.closeModal();
};
onResetBackground() {
const api = Common.EditorApi.get();
const props = new Asc.CAscSlideProps();
props.put_ResetBackground(true);
api.SetSlideProps(props);
}
render () {
return (
<EditSlide
@ -155,6 +162,7 @@ class EditSlideController extends Component {
onFillColor={this.onFillColor}
onDuplicateSlide={this.onDuplicateSlide}
onRemoveSlide={this.onRemoveSlide}
onResetBackground={this.onResetBackground}
/>
)
}

13
apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx
View File

@ -11,7 +11,9 @@ import IconExpandUp from '@common-android-icons/icon-expand-up.svg';
const EditSlide = props => {
const { t } = useTranslation();
const _t = t('View.Edit', {returnObjects: true});
const _t = t('View.Edit', {returnObjects: true});
const storeFocusObjects = props.storeFocusObjects;
const isLockResetBackground = storeFocusObjects.slideObject.get_LockResetBackground();
return (
<Fragment>
@ -31,9 +33,12 @@ const EditSlide = props => {
onDelay: props.onDelay,
onApplyAll: props.onApplyAll
}}></ListItem>
<ListItem title={_t.textStyle} link="/style/" routeProps={{
</List>
<List>
<ListItem title={_t.textBackground} link="/style/" routeProps={{
onFillColor: props.onFillColor
}}></ListItem>
<ListItem className={isLockResetBackground ? 'disabled' : ''} title={_t.textResetBackground} onClick={()=>{props.onResetBackground()}}></ListItem>
</List>
<List className="buttons-list">
<ListButton className="button-fill button-raised" onClick={props.onDuplicateSlide}>{_t.textDuplicateSlide}</ListButton>
@ -91,6 +96,7 @@ const PageLayout = props => {
storeSlideSettings.changeSlideLayoutIndex(storeFocusObjects.slideObject.get_LayoutIndex());
const arrayLayouts = storeSlideSettings.slideLayouts;
const slideLayoutIndex = storeSlideSettings.slideLayoutIndex;
return (
<Page className="slide-layout">
@ -495,6 +501,7 @@ const PageCustomFillColor = props => {
)
};
const InjectEditSlide = inject("storeFocusObjects")(observer(EditSlide));
const Theme = inject("storeSlideSettings")(observer(PageTheme));
const Layout = inject("storeSlideSettings", "storeFocusObjects")(observer(PageLayout));
const Transition = inject("storeSlideSettings", "storeFocusObjects")(observer(PageTransition));
@ -504,7 +511,7 @@ const StyleFillColor = inject("storeSlideSettings", "storePalette", "storeFocusO
const CustomFillColor = inject("storeSlideSettings", "storePalette", "storeFocusObjects")(observer(PageCustomFillColor));
export {
EditSlide,
InjectEditSlide as EditSlide,
Theme,
Layout,
Transition,