From 1e1ea2c49f346a5a7a958d39992bd073b6341d0b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Aug 2016 17:26:34 +0300 Subject: [PATCH 1/2] [SSE] Bug with plugin editing. --- apps/spreadsheeteditor/main/app/view/ImageSettings.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index e3c0e02ac5..72e38c1b9a 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/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)) { From b0c7c000f769867eeea195e3a2a34197d6000217 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Aug 2016 17:54:19 +0300 Subject: [PATCH 2/2] Fix Bug 32998. --- apps/common/main/lib/component/ComboBox.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js index 2687b0e236..35f3ca96fe 100644 --- a/apps/common/main/lib/component/ComboBox.js +++ b/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); },