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

Merge branch 'release/v7.1.0' into feature/bug-fixes

Browse source
This commit is contained in:
SergeyEzhin 2022-03-11 12:32:26 +04:00 committed by GitHub
parent 93932c3997 9e8ebfc482
commit 3de5972440
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 40 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/common/mobile/resources/less/common-material.less
View file

@ -412,10 +412,14 @@
} }
} }
.popover__titled { .popover__titled {
.list:last-child { .list {
li:last-child { ul {
a { background-color: var(--f7-list-bg-color);
li:first-child, li:last-child {
border-radius: 0; border-radius: 0;
a {
border-radius: 0;
}
} }
} }
} }

2
apps/documenteditor/mobile/src/less/app.less
View file

@ -201,7 +201,7 @@
background-color: transparent; background-color: transparent;
} }
.calendar-day-weekend .calendar-day-number { .calendar-day-weekend .calendar-day-number {
color: #D25252; color: #D25252;
} }
.calendar-day-number { .calendar-day-number {
color: @text-normal; color: @text-normal;

5
apps/documenteditor/mobile/src/less/icons-ios.less
View file

@ -243,6 +243,11 @@
height: 28px; height: 28px;
.encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{brandColor}"><g><rect opacity="0.3" x="8" y="8" width="13" height="13"/><path d="M1,1V13H13V1H1ZM12,12H2V2H12V12Z"/><path d="M15,15V27H27V15H15ZM26,26H16V16H26V26Z"/></g></svg>'); .encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{brandColor}"><g><rect opacity="0.3" x="8" y="8" width="13" height="13"/><path d="M1,1V13H13V1H1ZM12,12H2V2H12V12Z"/><path d="M15,15V27H27V15H15ZM26,26H16V16H26V26Z"/></g></svg>');
} }
&.icon-move-background {
width: 28px;
height: 28px;
.encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{brandColor}"><g><rect opacity="0.3" x="8" y="8" width="13" height="13"/><path d="M1,1V13H13V1H1ZM12,12H2V2H12V12Z"/><path d="M15,15V27H27V15H15ZM26,26H16V16H26V26Z"/></g></svg>');
}
&.icon-move-foreground { &.icon-move-foreground {
width: 28px; width: 28px;
height: 28px; height: 28px;

5
apps/documenteditor/mobile/src/less/icons-material.less
View file

@ -267,6 +267,11 @@
height: 28px; height: 28px;
.encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{brandColor}"><g><rect opacity="0.3" x="8" y="8" width="13" height="13"/><path d="M1,1V13H13V1H1ZM12,12H2V2H12V12Z"/><path d="M15,15V27H27V15H15ZM26,26H16V16H26V26Z"/></g></svg>'); .encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{brandColor}"><g><rect opacity="0.3" x="8" y="8" width="13" height="13"/><path d="M1,1V13H13V1H1ZM12,12H2V2H12V12Z"/><path d="M15,15V27H27V15H15ZM26,26H16V16H26V26Z"/></g></svg>');
} }
&.icon-move-background {
width: 28px;
height: 28px;
.encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{brandColor}"><g><rect opacity="0.3" x="8" y="8" width="13" height="13"/><path d="M1,1V13H13V1H1ZM12,12H2V2H12V12Z"/><path d="M15,15V27H27V15H15ZM26,26H16V16H26V26Z"/></g></svg>');
}
&.icon-move-foreground { &.icon-move-foreground {
width: 28px; width: 28px;
height: 28px; height: 28px;

3
apps/presentationeditor/main/app/view/Animation.js
View file

@ -63,7 +63,8 @@ define([
me.fireEvent('animation:selecteffect', [combo, record]); me.fireEvent('animation:selecteffect', [combo, record]);
}, me)); }, me));
me.listEffectsMore.on('click', _.bind(function () { me.listEffectsMore.on('click', _.bind(function () {
me.fireEvent('animation:additional', [me.listEffects.menuPicker.getSelectedRec().get('value') != AscFormat.ANIM_PRESET_NONE]); // replace effect var rec = me.listEffects.menuPicker.getSelectedRec();
me.fireEvent('animation:additional', [!(rec && rec.get('value') === AscFormat.ANIM_PRESET_NONE)]); // replace effect
}, me)); }, me));
} }

3
apps/presentationeditor/mobile/src/controller/edit/EditChart.jsx
View file

@ -11,6 +11,7 @@ class EditChartController extends Component {
this.onType = this.onType.bind(this); this.onType = this.onType.bind(this);
this.onBorderColor = this.onBorderColor.bind(this); this.onBorderColor = this.onBorderColor.bind(this);
this.onBorderSize = this.onBorderSize.bind(this); this.onBorderSize = this.onBorderSize.bind(this);
this.onStyle = this.onStyle.bind(this);
const type = props.storeFocusObjects.chartObject.getType(); const type = props.storeFocusObjects.chartObject.getType();
if (type==Asc.c_oAscChartTypeSettings.comboBarLine || if (type==Asc.c_oAscChartTypeSettings.comboBarLine ||
@ -88,7 +89,7 @@ class EditChartController extends Component {
onStyle (style) { onStyle (style) {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
let chart = new Asc.CAscChartProp(); let chart = new Asc.CAscChartProp();
const chartProps = this.storeFocusObjects.chartObject.get_ChartProperties(); const chartProps = this.props.storeFocusObjects.chartObject.get_ChartProperties();
chartProps.putStyle(style); chartProps.putStyle(style);
chart.put_ChartProperties(chartProps); chart.put_ChartProperties(chartProps);
api.ChartApply(chart); api.ChartApply(chart);

2
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -264,7 +264,7 @@ define([
if ((!Common.Utils.ModalWindow.isVisible() || $('.asc-window.enable-key-events:visible').length>0) && !(me.loadMask && me.loadMask.isVisible())) { if ((!Common.Utils.ModalWindow.isVisible() || $('.asc-window.enable-key-events:visible').length>0) && !(me.loadMask && me.loadMask.isVisible())) {
if (/form-control/.test(e.target.className)) if (/form-control/.test(e.target.className))
me.inFormControl = false; me.inFormControl = false;
if (me.getApplication().getController('LeftMenu').getView('LeftMenu').getMenu('file').isVisible()) if (me.getApplication().getController('LeftMenu').getView('LeftMenu').getMenu('file').isVisible() && $('.asc-window.enable-key-events:visible').length === 0)
return; return;
if (!e.relatedTarget || if (!e.relatedTarget ||
!/area_id/.test(e.target.id) !/area_id/.test(e.target.id)

10
apps/spreadsheeteditor/mobile/src/controller/LongActions.jsx
View file

@ -26,12 +26,17 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => {
}; };
useEffect( () => { useEffect( () => {
Common.Notifications.on('engineCreated', (api) => { const on_engine_created = api => {
api.asc_registerCallback('asc_onStartAction', onLongActionBegin); api.asc_registerCallback('asc_onStartAction', onLongActionBegin);
api.asc_registerCallback('asc_onEndAction', onLongActionEnd); api.asc_registerCallback('asc_onEndAction', onLongActionEnd);
api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument);
api.asc_registerCallback('asc_onConfirmAction', onConfirmAction); api.asc_registerCallback('asc_onConfirmAction', onConfirmAction);
}); };
const api = Common.EditorApi.get();
if(!api) Common.Notifications.on('engineCreated', on_engine_created);
else on_engine_created(api);
Common.Notifications.on('preloader:endAction', onLongActionEnd); Common.Notifications.on('preloader:endAction', onLongActionEnd);
Common.Notifications.on('preloader:beginAction', onLongActionBegin); Common.Notifications.on('preloader:beginAction', onLongActionBegin);
Common.Notifications.on('preloader:close', closePreloader); Common.Notifications.on('preloader:close', closePreloader);
@ -45,6 +50,7 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => {
api.asc_unregisterCallback('asc_onConfirmAction', onConfirmAction); api.asc_unregisterCallback('asc_onConfirmAction', onConfirmAction);
} }
Common.Notifications.off('engineCreated', on_engine_created);
Common.Notifications.off('preloader:endAction', onLongActionEnd); Common.Notifications.off('preloader:endAction', onLongActionEnd);
Common.Notifications.off('preloader:beginAction', onLongActionBegin); Common.Notifications.off('preloader:beginAction', onLongActionBegin);
Common.Notifications.off('preloader:close', closePreloader); Common.Notifications.off('preloader:close', closePreloader);

7
apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx
View file

@ -366,6 +366,13 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(observer(props =>
api.asc_showWorksheet(sheetIndex); api.asc_showWorksheet(sheetIndex);
f7.popover.close('#idx-all-list'); f7.popover.close('#idx-all-list');
} }
const tab = $$('.sheet-tabs .tab').eq(sheetIndex);
if(tab.offset().left < 0) {
$$('.sheet-tabs').scrollLeft( $$('.sheet-tabs').scrollLeft() + tab.offset().left - 96, 500);
} else {
$$('.sheet-tabs').scrollLeft( $$('.sheet-tabs').scrollLeft() + (tab.offset().left + tab.width() - $$('.sheet-tabs').width()/1.5), 500);
}
}; };
return ( return (

4
apps/spreadsheeteditor/mobile/src/less/statusbar.less
View file

@ -46,8 +46,8 @@
padding: 0; padding: 0;
margin: 0; margin: 0;
height: 100%; height: 100%;
white-space: pre; white-space: nowrap;
// overflow: hidden; overflow-x: scroll;
// position: absolute; // position: absolute;
// left: 0; // left: 0;
// top: 0; // top: 0;