From f06a59f4efd021ced565a03872c52de40e1ec05b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 2 Aug 2017 15:40:49 +0300 Subject: [PATCH] Fix Bug 35345. --- apps/documenteditor/main/app/view/ShapeSettings.js | 12 ++++++------ apps/documenteditor/main/app/view/TextArtSettings.js | 12 ++++++------ .../main/app/view/ShapeSettings.js | 12 ++++++------ .../main/app/view/TextArtSettings.js | 12 ++++++------ .../spreadsheeteditor/main/app/view/ShapeSettings.js | 12 ++++++------ .../main/app/view/TextArtSettings.js | 12 ++++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 75c136fe4..f6975dee3 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -551,7 +551,7 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); this._state.StrokeType = this._state.StrokeWidth = -1; } else { @@ -603,7 +603,7 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); @@ -624,7 +624,7 @@ define([ if (this.api && this.BorderSize>0 && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); @@ -1029,14 +1029,14 @@ define([ if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { var w = stroke.get_width(); - var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); - if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || + var check_value = (Math.abs(this._state.StrokeWidth-w)<0.00001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); + if ( Math.abs(this._state.StrokeWidth-w)>0.00001 || check_value || (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { this._state.StrokeWidth = w; if (w!==null) w = this._mm2pt(w); var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) { - if ( witem.attributes.value-0.01) { + if ( witem.attributes.value-0.00001) { return true; } }); diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index 479909abb..35ec21de0 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -417,7 +417,7 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); this._state.StrokeType = this._state.StrokeWidth = -1; } else { @@ -469,7 +469,7 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); @@ -490,7 +490,7 @@ define([ if (this.api && this.BorderSize>0 && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); @@ -721,14 +721,14 @@ define([ if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { var w = stroke.get_width(); - var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); - if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || + var check_value = (Math.abs(this._state.StrokeWidth-w)<0.00001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); + if ( Math.abs(this._state.StrokeWidth-w)>0.00001 || check_value || (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { this._state.StrokeWidth = w; if (w!==null) w = this._mm2pt(w); var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) { - if ( witem.attributes.value-0.01) { + if ( witem.attributes.value-0.00001) { return true; } }); diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index dadf43a91..e44ce7f15 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -531,7 +531,7 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); this._state.StrokeType = this._state.StrokeWidth = -1; } else { @@ -582,7 +582,7 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); @@ -602,7 +602,7 @@ define([ if (this.api && this.BorderSize>0 && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); @@ -942,14 +942,14 @@ define([ if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { var w = stroke.get_width(); - var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); - if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || + var check_value = (Math.abs(this._state.StrokeWidth-w)<0.00001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); + if ( Math.abs(this._state.StrokeWidth-w)>0.00001 || check_value || (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { this._state.StrokeWidth = w; if (w!==null) w = this._mm2pt(w); var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) { - if ( witem.attributes.value-0.01) { + if ( witem.attributes.value-0.00001) { return true; } }); diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index a51b3d261..42b739c68 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -538,7 +538,7 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); this._state.StrokeType = this._state.StrokeWidth = -1; } else { @@ -590,7 +590,7 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); @@ -611,7 +611,7 @@ define([ if (this.api && this.BorderSize>0 && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); @@ -920,14 +920,14 @@ define([ if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { var w = stroke.get_width(); - var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); - if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || + var check_value = (Math.abs(this._state.StrokeWidth-w)<0.00001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); + if ( Math.abs(this._state.StrokeWidth-w)>0.00001 || check_value || (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { this._state.StrokeWidth = w; if (w!==null) w = this._mm2pt(w); var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) { - if ( witem.attributes.value-0.01) { + if ( witem.attributes.value-0.00001) { return true; } }); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index f11030b49..b6aa676e4 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -547,7 +547,7 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE); this._state.StrokeType = this._state.StrokeWidth = -1; } else { @@ -599,7 +599,7 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); @@ -620,7 +620,7 @@ define([ if (this.api && this.BorderSize>0 && !this._noApply) { var props = new Asc.asc_CShapeProperty(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE); } else { stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_COLOR); @@ -966,14 +966,14 @@ define([ if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { var w = stroke.asc_getWidth(); - var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); - if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || + var check_value = (Math.abs(this._state.StrokeWidth-w)<0.00001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); + if ( Math.abs(this._state.StrokeWidth-w)>0.00001 || check_value || (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { this._state.StrokeWidth = w; if (w!==null) w = this._mm2pt(w); var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) { - if ( witem.attributes.value-0.01) { + if ( witem.attributes.value-0.00001) { return true; } }); diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index f31ebef90..0d0bb52fe 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -539,7 +539,7 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE); this._state.StrokeType = this._state.StrokeWidth = -1; } else { @@ -591,7 +591,7 @@ define([ if (this.api && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.put_type( Asc.c_oAscStrokeType.STROKE_NONE); } else { stroke.put_type( Asc.c_oAscStrokeType.STROKE_COLOR); @@ -612,7 +612,7 @@ define([ if (this.api && this.BorderSize>0 && !this._noApply) { var props = new Asc.asc_TextArtProperties(); var stroke = new Asc.asc_CStroke(); - if (this.BorderSize<0.01) { + if (this.BorderSize<0.00001) { stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_NONE); } else { stroke.asc_putType( Asc.c_oAscStrokeType.STROKE_COLOR); @@ -924,14 +924,14 @@ define([ if (this._state.StrokeType !== strokeType || strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { if ( strokeType == Asc.c_oAscStrokeType.STROKE_COLOR ) { var w = stroke.asc_getWidth(); - var check_value = (Math.abs(this._state.StrokeWidth-w)<0.001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); - if ( Math.abs(this._state.StrokeWidth-w)>0.001 || check_value || + var check_value = (Math.abs(this._state.StrokeWidth-w)<0.00001) && !((new RegExp(this.txtPt + '\\s*$')).test(this.cmbBorderSize.getRawValue())); + if ( Math.abs(this._state.StrokeWidth-w)>0.00001 || check_value || (this._state.StrokeWidth===null || w===null)&&(this._state.StrokeWidth!==w)) { this._state.StrokeWidth = w; if (w!==null) w = this._mm2pt(w); var _selectedItem = (w===null) ? w : _.find(this.cmbBorderSize.store.models, function(item) { - if ( witem.attributes.value-0.01) { + if ( witem.attributes.value-0.00001) { return true; } });