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

Fix Bug 38456

Browse source
This commit is contained in:
Julia Radzhabova 2018-08-10 13:46:19 +03:00
parent f84836fbef
commit ef02ce4ace
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -577,14 +577,14 @@ define([
var width = this._state.pgorient ? w : h, var width = this._state.pgorient ? w : h,
height = this._state.pgorient ? h : w; height = this._state.pgorient ? h : w;
if (Math.abs(this._state.pgsize[0] - w) > 0.01 || if (Math.abs(this._state.pgsize[0] - w) > 0.1 ||
Math.abs(this._state.pgsize[1] - h) > 0.01) { Math.abs(this._state.pgsize[1] - h) > 0.1) {
this._state.pgsize = [w, h]; this._state.pgsize = [w, h];
if (this.toolbar.mnuPageSize) { if (this.toolbar.mnuPageSize) {
this.toolbar.mnuPageSize.clearAll(); this.toolbar.mnuPageSize.clearAll();
_.each(this.toolbar.mnuPageSize.items, function(item){ _.each(this.toolbar.mnuPageSize.items, function(item){
if (item.value && typeof(item.value) == 'object' && if (item.value && typeof(item.value) == 'object' &&
Math.abs(item.value[0] - width) < 0.01 && Math.abs(item.value[1] - height) < 0.01) { Math.abs(item.value[0] - width) < 0.1 && Math.abs(item.value[1] - height) < 0.1) {
item.setChecked(true); item.setChecked(true);
return false; return false;
} }
@ -600,16 +600,16 @@ define([
right = props.get_RightMargin(), right = props.get_RightMargin(),
bottom = props.get_BottomMargin(); bottom = props.get_BottomMargin();
if (!this._state.pgmargins || Math.abs(this._state.pgmargins[0] - top) > 0.01 || if (!this._state.pgmargins || Math.abs(this._state.pgmargins[0] - top) > 0.1 ||
Math.abs(this._state.pgmargins[1] - left) > 0.01 || Math.abs(this._state.pgmargins[2] - bottom) > 0.01 || Math.abs(this._state.pgmargins[1] - left) > 0.1 || Math.abs(this._state.pgmargins[2] - bottom) > 0.1 ||
Math.abs(this._state.pgmargins[3] - right) > 0.01) { Math.abs(this._state.pgmargins[3] - right) > 0.1) {
this._state.pgmargins = [top, left, bottom, right]; this._state.pgmargins = [top, left, bottom, right];
if (this.toolbar.btnPageMargins.menu) { if (this.toolbar.btnPageMargins.menu) {
this.toolbar.btnPageMargins.menu.clearAll(); this.toolbar.btnPageMargins.menu.clearAll();
_.each(this.toolbar.btnPageMargins.menu.items, function(item){ _.each(this.toolbar.btnPageMargins.menu.items, function(item){
if (item.value && typeof(item.value) == 'object' && if (item.value && typeof(item.value) == 'object' &&
Math.abs(item.value[0] - top) < 0.01 && Math.abs(item.value[1] - left) < 0.01 && Math.abs(item.value[0] - top) < 0.1 && Math.abs(item.value[1] - left) < 0.1 &&
Math.abs(item.value[2] - bottom) < 0.01 && Math.abs(item.value[3] - right) < 0.01) { Math.abs(item.value[2] - bottom) < 0.1 && Math.abs(item.value[3] - right) < 0.1) {
item.setChecked(true); item.setChecked(true);
return false; return false;
} }

2
apps/documenteditor/main/app/view/PageSizeDialog.js
View file

@ -201,7 +201,7 @@ define([
height = this.isOrientPortrait ? props.get_H() : props.get_W(); height = this.isOrientPortrait ? props.get_H() : props.get_W();
var rec = this.cmbPreset.store.find(function(item){ var rec = this.cmbPreset.store.find(function(item){
var size = item.get('size'); var size = item.get('size');
return (Math.abs(size[0] - width) < 0.01 && Math.abs(size[1] - height) < 0.01); return (Math.abs(size[0] - width) < 0.1 && Math.abs(size[1] - height) < 0.1);
}); });
this.cmbPreset.setValue((rec) ? rec.get('value') : -1); this.cmbPreset.setValue((rec) ? rec.get('value') : -1);
} }

16
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1712,14 +1712,14 @@ define([
onApiPageSize: function(w, h) { onApiPageSize: function(w, h) {
if (this._state.pgorient===undefined) return; if (this._state.pgorient===undefined) return;
if (Math.abs(this._state.pgsize[0] - w) > 0.01 || if (Math.abs(this._state.pgsize[0] - w) > 0.1 ||
Math.abs(this._state.pgsize[1] - h) > 0.01) { Math.abs(this._state.pgsize[1] - h) > 0.1) {
this._state.pgsize = [w, h]; this._state.pgsize = [w, h];
if (this.toolbar.mnuPageSize) { if (this.toolbar.mnuPageSize) {
this.toolbar.mnuPageSize.clearAll(); this.toolbar.mnuPageSize.clearAll();
_.each(this.toolbar.mnuPageSize.items, function(item){ _.each(this.toolbar.mnuPageSize.items, function(item){
if (item.value && typeof(item.value) == 'object' && if (item.value && typeof(item.value) == 'object' &&
Math.abs(item.value[0] - w) < 0.01 && Math.abs(item.value[1] - h) < 0.01) { Math.abs(item.value[0] - w) < 0.1 && Math.abs(item.value[1] - h) < 0.1) {
item.setChecked(true); item.setChecked(true);
return false; return false;
} }
@ -1735,16 +1735,16 @@ define([
right = props.asc_getRight(), right = props.asc_getRight(),
bottom = props.asc_getBottom(); bottom = props.asc_getBottom();
if (!this._state.pgmargins || Math.abs(this._state.pgmargins[0] - top) > 0.01 || if (!this._state.pgmargins || Math.abs(this._state.pgmargins[0] - top) > 0.1 ||
Math.abs(this._state.pgmargins[1] - left) > 0.01 || Math.abs(this._state.pgmargins[2] - bottom) > 0.01 || Math.abs(this._state.pgmargins[1] - left) > 0.1 || Math.abs(this._state.pgmargins[2] - bottom) > 0.1 ||
Math.abs(this._state.pgmargins[3] - right) > 0.01) { Math.abs(this._state.pgmargins[3] - right) > 0.1) {
this._state.pgmargins = [top, left, bottom, right]; this._state.pgmargins = [top, left, bottom, right];
if (this.toolbar.btnPageMargins.menu) { if (this.toolbar.btnPageMargins.menu) {
this.toolbar.btnPageMargins.menu.clearAll(); this.toolbar.btnPageMargins.menu.clearAll();
_.each(this.toolbar.btnPageMargins.menu.items, function(item){ _.each(this.toolbar.btnPageMargins.menu.items, function(item){
if (item.value && typeof(item.value) == 'object' && if (item.value && typeof(item.value) == 'object' &&
Math.abs(item.value[0] - top) < 0.01 && Math.abs(item.value[1] - left) < 0.01 && Math.abs(item.value[0] - top) < 0.1 && Math.abs(item.value[1] - left) < 0.1 &&
Math.abs(item.value[2] - bottom) < 0.01 && Math.abs(item.value[3] - right) < 0.01) { Math.abs(item.value[2] - bottom) < 0.1 && Math.abs(item.value[3] - right) < 0.1) {
item.setChecked(true); item.setChecked(true);
return false; return false;
} }