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

Fix Bug 50014

Browse source
This commit is contained in:
Julia Radzhabova 2021-04-26 17:05:45 +03:00
parent 1d1db2e7b1
commit 386d55d785
7 changed files with 70 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -607,14 +607,16 @@ define([
expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$');
if (!(expr.exec(record.value)) || value<0 || value>1584) { if (!(expr.exec(record.value)) || value<0 || value>1584) {
this._state.StrokeType = this._state.StrokeWidth = -1; this._state.StrokeType = this._state.StrokeWidth = -1;
Common.UI.error({ setTimeout( function() {
msg: this.textBorderSizeErr, Common.UI.error({
callback: function() { msg: me.textBorderSizeErr,
_.defer(function(btn) { callback: function() {
me.fireEvent('editcomplete', me); _.defer(function(btn) {
}) me.fireEvent('editcomplete', me);
} })
}); }
});
}, 10);
} }
} else } else
this.applyBorderSize(record.value); this.applyBorderSize(record.value);

18
apps/documenteditor/main/app/view/TextArtSettings.js
View file

@ -477,14 +477,16 @@ define([
expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$');
if (!(expr.exec(record.value)) || value<0 || value>1584) { if (!(expr.exec(record.value)) || value<0 || value>1584) {
this._state.StrokeType = this._state.StrokeWidth = -1; this._state.StrokeType = this._state.StrokeWidth = -1;
Common.UI.error({ setTimeout( function() {
msg: this.textBorderSizeErr, Common.UI.error({
callback: function() { msg: me.textBorderSizeErr,
_.defer(function(btn) { callback: function() {
me.fireEvent('editcomplete', me); _.defer(function(btn) {
}) me.fireEvent('editcomplete', me);
} })
}); }
});
}, 10);
} }
} else } else
this.applyBorderSize(record.value); this.applyBorderSize(record.value);

18
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -587,14 +587,16 @@ define([
expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$');
if (!(expr.exec(record.value)) || value<0 || value>1584) { if (!(expr.exec(record.value)) || value<0 || value>1584) {
this._state.StrokeType = this._state.StrokeWidth = -1; this._state.StrokeType = this._state.StrokeWidth = -1;
Common.UI.error({ setTimeout( function() {
msg: this.textBorderSizeErr, Common.UI.error({
callback: function() { msg: me.textBorderSizeErr,
_.defer(function(btn) { callback: function() {
me.fireEvent('editcomplete', me); _.defer(function(btn) {
}) me.fireEvent('editcomplete', me);
} })
}); }
});
}, 10);
} }
} else } else
this.applyBorderSize(record.value); this.applyBorderSize(record.value);

18
apps/presentationeditor/main/app/view/TextArtSettings.js
View file

@ -596,14 +596,16 @@ define([
expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$');
if (!(expr.exec(record.value)) || value<0 || value>1584) { if (!(expr.exec(record.value)) || value<0 || value>1584) {
this._state.StrokeType = this._state.StrokeWidth = -1; this._state.StrokeType = this._state.StrokeWidth = -1;
Common.UI.error({ setTimeout( function() {
msg: this.textBorderSizeErr, Common.UI.error({
callback: function() { msg: me.textBorderSizeErr,
_.defer(function(btn) { callback: function() {
me.fireEvent('editcomplete', me); _.defer(function(btn) {
}) me.fireEvent('editcomplete', me);
} })
}); }
});
}, 10);
} }
} else } else
this.applyBorderSize(record.value); this.applyBorderSize(record.value);

18
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View file

@ -1123,14 +1123,16 @@ define([
expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$');
if (!(expr.exec(record.value)) || value<0.01 || value>1584) { if (!(expr.exec(record.value)) || value<0.01 || value>1584) {
this._state.LineWeight = -1; this._state.LineWeight = -1;
Common.UI.error({ setTimeout( function() {
msg: this.textBorderSizeErr, Common.UI.error({
callback: function() { msg: me.textBorderSizeErr,
_.defer(function(btn) { callback: function() {
Common.NotificationCenter.trigger('edit:complete', me); _.defer(function(btn) {
}) Common.NotificationCenter.trigger('edit:complete', me);
} })
}); }
});
}, 10);
} }
} else } else
this.applyBorderSize(record.value); this.applyBorderSize(record.value);

18
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -604,14 +604,16 @@ define([
expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$');
if (!(expr.exec(record.value)) || value<0 || value>1584) { if (!(expr.exec(record.value)) || value<0 || value>1584) {
this._state.StrokeType = this._state.StrokeWidth = -1; this._state.StrokeType = this._state.StrokeWidth = -1;
Common.UI.error({ setTimeout( function() {
msg: this.textBorderSizeErr, Common.UI.error({
callback: function() { msg: me.textBorderSizeErr,
_.defer(function(btn) { callback: function() {
Common.NotificationCenter.trigger('edit:complete', me); _.defer(function(btn) {
}) Common.NotificationCenter.trigger('edit:complete', me);
} })
}); }
});
}, 10);
} }
} else } else
this.applyBorderSize(record.value); this.applyBorderSize(record.value);

18
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -597,14 +597,16 @@ define([
expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$');
if (!(expr.exec(record.value)) || value<0 || value>1584) { if (!(expr.exec(record.value)) || value<0 || value>1584) {
this._state.StrokeType = this._state.StrokeWidth = -1; this._state.StrokeType = this._state.StrokeWidth = -1;
Common.UI.error({ setTimeout( function() {
msg: this.textBorderSizeErr, Common.UI.error({
callback: function() { msg: me.textBorderSizeErr,
_.defer(function(btn) { callback: function() {
Common.NotificationCenter.trigger('edit:complete', me); _.defer(function(btn) {
}) Common.NotificationCenter.trigger('edit:complete', me);
} })
}); }
});
}, 10);
} }
} else } else
this.applyBorderSize(record.value); this.applyBorderSize(record.value);