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

Merge pull request #19 from ONLYOFFICE/release/v4.1.0

Browse source 
Release/v4.1.0
This commit is contained in:
Julia Radzhabova 2016-08-29 17:55:54 +03:00 committed by GitHub
parent d6c7684bed b0c7c000f7
commit 1fbebd0d9e
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/common/main/lib/component/ComboBox.js
View file

@ -211,8 +211,17 @@ define([
openMenu: function(delay) { openMenu: function(delay) {
var me = this; var me = this;
if ( !this.scroller ) {
this.scroller = new Common.UI.Scroller(_.extend({
el: $('.dropdown-menu', this.cmpEl),
minScrollbarLength: 40,
scrollYMarginOffset: 30,
includePadding: true
}, this.options.scroller));
}
_.delay(function(){ _.delay(function(){
me.cmpEl.addClass('open') me.cmpEl.addClass('open');
}, delay || 0); }, delay || 0);
}, },

3
apps/spreadsheeteditor/main/app/view/ImageSettings.js
View file

@ -80,6 +80,7 @@ define([
this._locked = false; this._locked = false;
this._noApply = false; this._noApply = false;
this._originalProps = null;
this.render(); this.render();
@ -199,6 +200,8 @@ define([
this.disableControls(this._locked); this.disableControls(this._locked);
if (props ){ if (props ){
this._originalProps = new Asc.asc_CImgProperty(props);
var value = props.asc_getWidth(); var value = props.asc_getWidth();
if ( Math.abs(this._state.Width-value)>0.001 || if ( Math.abs(this._state.Width-value)>0.001 ||
(this._state.Width===null || value===null)&&(this._state.Width!==value)) { (this._state.Width===null || value===null)&&(this._state.Width!==value)) {