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

[SSE] Bug 40747

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-19 10:02:41 +03:00
parent 76a90f93b2
commit c6ec8dac5c
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js
View file

@ -167,6 +167,22 @@ define([
render: function() { render: function() {
Common.UI.Window.prototype.render.call(this); Common.UI.Window.prototype.render.call(this);
this.menuAddAlign = function(menuRoot, left, top) {
var self = this;
if (!$window.hasClass('notransform')) {
$window.addClass('notransform');
menuRoot.addClass('hidden');
setTimeout(function() {
menuRoot.removeClass('hidden');
menuRoot.css({left: left, top: top});
self.options.additionalAlign = null;
}, 300);
} else {
menuRoot.css({left: left, top: top});
self.options.additionalAlign = null;
}
};
var me = this, var me = this,
$window = this.getChild(); $window = this.getChild();
@ -305,6 +321,7 @@ define([
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
style: 'min-width: 110px;', style: 'min-width: 110px;',
maxHeight: 200, maxHeight: 200,
additionalAlign: this.menuAddAlign,
items: data items: data
}) })
}); });
@ -319,6 +336,7 @@ define([
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
style: 'min-width: 110px;', style: 'min-width: 110px;',
maxHeight: 200, maxHeight: 200,
additionalAlign: this.menuAddAlign,
items: data items: data
}) })
}); });
@ -560,6 +578,7 @@ define([
hint : this.textColor, hint : this.textColor,
split : true, split : true,
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [ items: [
{ template: _.template('<div id="id-dlg-h-menu-fontcolor" style="width: 169px; height: 220px; margin: 10px;"></div>') }, { template: _.template('<div id="id-dlg-h-menu-fontcolor" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="id-dlg-h-menu-fontcolor-new" style="padding-left:12px;">' + this.textNewColor + '</a>') } { template: _.template('<a id="id-dlg-h-menu-fontcolor-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
@ -578,6 +597,7 @@ define([
hint : this.textColor, hint : this.textColor,
split : true, split : true,
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
additionalAlign: this.menuAddAlign,
items: [ items: [
{ template: _.template('<div id="id-dlg-f-menu-fontcolor" style="width: 169px; height: 220px; margin: 10px;"></div>') }, { template: _.template('<div id="id-dlg-f-menu-fontcolor" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="id-dlg-f-menu-fontcolor-new" style="padding-left:12px;">' + this.textNewColor + '</a>') } { template: _.template('<a id="id-dlg-f-menu-fontcolor-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
@ -666,12 +686,14 @@ define([
this.btnPresetsH.setMenu(new Common.UI.Menu({ this.btnPresetsH.setMenu(new Common.UI.Menu({
style: 'min-width: 110px;', style: 'min-width: 110px;',
maxHeight: 200, maxHeight: 200,
additionalAlign: this.menuAddAlign,
items: presets items: presets
})); }));
this.btnPresetsH.menu.on('item:click', _.bind(this.onPresetSelect, this, false)); this.btnPresetsH.menu.on('item:click', _.bind(this.onPresetSelect, this, false));
this.btnPresetsF.setMenu(new Common.UI.Menu({ this.btnPresetsF.setMenu(new Common.UI.Menu({
style: 'min-width: 110px;', style: 'min-width: 110px;',
maxHeight: 200, maxHeight: 200,
additionalAlign: this.menuAddAlign,
items: presets items: presets
})); }));
this.btnPresetsF.menu.on('item:click', _.bind(this.onPresetSelect, this, true)); this.btnPresetsF.menu.on('item:click', _.bind(this.onPresetSelect, this, true));