From 386d55d785e25134eadce19e6dfcaf048c4be1ed Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 26 Apr 2021 17:05:45 +0300 Subject: [PATCH] Fix Bug 50014 --- .../main/app/view/ShapeSettings.js | 18 ++++++++++-------- .../main/app/view/TextArtSettings.js | 18 ++++++++++-------- .../main/app/view/ShapeSettings.js | 18 ++++++++++-------- .../main/app/view/TextArtSettings.js | 18 ++++++++++-------- .../main/app/view/ChartSettings.js | 18 ++++++++++-------- .../main/app/view/ShapeSettings.js | 18 ++++++++++-------- .../main/app/view/TextArtSettings.js | 18 ++++++++++-------- 7 files changed, 70 insertions(+), 56 deletions(-) diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index bce04d508..1f0788b83 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -607,14 +607,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - me.fireEvent('editcomplete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + me.fireEvent('editcomplete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index 58beba4ab..a375b7b6d 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -477,14 +477,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - me.fireEvent('editcomplete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + me.fireEvent('editcomplete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 9a7270677..b0cd3306c 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -587,14 +587,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - me.fireEvent('editcomplete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + me.fireEvent('editcomplete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index 5abd60a1a..bb159c568 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -596,14 +596,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - me.fireEvent('editcomplete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + me.fireEvent('editcomplete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index 7757c489d..a49e4dea6 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -1123,14 +1123,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0.01 || value>1584) { this._state.LineWeight = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - Common.NotificationCenter.trigger('edit:complete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + Common.NotificationCenter.trigger('edit:complete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 6fb27fc46..0b5a3b1b9 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -604,14 +604,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - Common.NotificationCenter.trigger('edit:complete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + Common.NotificationCenter.trigger('edit:complete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index 31d6dd13b..4ac500887 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -597,14 +597,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - Common.NotificationCenter.trigger('edit:complete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + Common.NotificationCenter.trigger('edit:complete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value);