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

Merge pull request #863 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-05-06 00:31:49 +03:00 committed by GitHub
parent 949c412319 766d47e7af
commit 0652b873cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/documenteditor/main/app/view/ListSettingsDialog.js
View file

@ -336,6 +336,8 @@ define([
}); });
this.levelsList.on('item:select', _.bind(this.onSelectLevel, this)); this.levelsList.on('item:select', _.bind(this.onSelectLevel, this));
this.on('animate:after', _.bind(this.onAnimateAfter, this));
this.afterRender(); this.afterRender();
}, },
@ -347,6 +349,12 @@ define([
return this.type > 0 ? this.cmbFormat : this.cmbAlign; return this.type > 0 ? this.cmbFormat : this.cmbAlign;
}, },
onAnimateAfter: function() {
if (this.api) {
this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2);
}
},
afterRender: function() { afterRender: function() {
this.updateThemeColors(); this.updateThemeColors();
this._setDefaults(this.props); this._setDefaults(this.props);
@ -552,9 +560,6 @@ define([
} else } else
this.cmbFormat.setValue((format!==undefined) ? format : ''); this.cmbFormat.setValue((format!==undefined) ? format : '');
} }
if (this.api) {
this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2);
}
}, },
txtTitle: 'List Settings', txtTitle: 'List Settings',

2
apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -142,7 +142,7 @@ define([
style : 'width: 100%;', style : 'width: 100%;',
validation : function(value) { validation : function(value) {
var trimmed = $.trim(value); var trimmed = $.trim(value);
if (trimmed.length>2083) return me.txtSizeLimit; if (me.api.asc_getFullHyperlinkLength(trimmed)>2083) return me.txtSizeLimit;
var urltype = me.api.asc_getUrlType(trimmed); var urltype = me.api.asc_getUrlType(trimmed);
me.isEmail = (urltype==2); me.isEmail = (urltype==2);