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

Merge pull request #1636 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2022-03-18 16:51:29 +03:00 committed by GitHub
parent 007f260583 4101181092
commit 3577d256cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/presentationeditor/main/app/controller/Animation.js
View file

@ -206,7 +206,7 @@ define([
if (!item) { if (!item) {
var expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.view.txtSec + ')?\\s*$'); var expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.view.txtSec + ')?\\s*$');
if (!expr.exec(record.value)) { if (!expr.exec(record.value)) {
combo.setValue(this._state.Duration, this._state.Duration>=0 ? this._state.Duration + ' ' + this.view.txtSec : 1); combo.setValue(this._state.Duration, this._state.Duration>=0 ? this._state.Duration + ' ' + this.view.txtSec : '');
e.preventDefault(); e.preventDefault();
return false; return false;
} }
@ -447,7 +447,7 @@ define([
if (this._state.noAnimationDuration) if (this._state.noAnimationDuration)
view.cmbDuration.setValue(''); view.cmbDuration.setValue('');
else else
view.cmbDuration.setValue(this._state.Duration, this._state.Duration>=0 ? this._state.Duration + ' ' + this.view.txtSec : 1); view.cmbDuration.setValue(this._state.Duration, this._state.Duration>=0 ? this._state.Duration + ' ' + this.view.txtSec : '');
value = this.AnimationProperties.asc_getDelay(); value = this.AnimationProperties.asc_getDelay();
if (Math.abs(this._state.Delay - value) > 0.001 || if (Math.abs(this._state.Delay - value) > 0.001 ||

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

@ -448,9 +448,9 @@ class MainController extends Component {
boxSdk.append(dropdownListTarget); boxSdk.append(dropdownListTarget);
} }
let coord = this.api.asc_getActiveCellCoord(), let coord = this.api.asc_getActiveCellCoord(validation),
offset = {left: 0, top: 0}, offset = {left: 0, top: 0},
showPoint = [coord.asc_getX() + offset.left, (coord.asc_getY() < 0 ? 0 : coord.asc_getY()) + coord.asc_getHeight() + offset.top]; showPoint = [coord.asc_getX() + offset.left + (validation ? coord.asc_getWidth() : 0), (coord.asc_getY() < 0 ? 0 : coord.asc_getY()) + coord.asc_getHeight() + offset.top];
dropdownListTarget.css({left: `${showPoint[0]}px`, top: `${showPoint[1]}px`}); dropdownListTarget.css({left: `${showPoint[0]}px`, top: `${showPoint[1]}px`});
} }