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

Release/v4.1.0

apps/common/main/lib/component/ComboBox.js

@@ -211,8 +211,17 @@ define([
             openMenu: function(delay) {
                 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(){
-                    me.cmpEl.addClass('open')
+                    me.cmpEl.addClass('open');
                 }, delay || 0);
             },
 

apps/spreadsheeteditor/main/app/view/ImageSettings.js

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