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

[PE][SSE] Fix Bug 58271

Browse source
This commit is contained in:
Julia Radzhabova 2022-07-25 21:38:10 +03:00
parent daa36e10ed
commit b662f8bdc7
4 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -406,7 +406,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
el: $('#shape-advanced-begin-style'), el: $('#shape-advanced-begin-style'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>', '<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -424,7 +424,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
el: $('#shape-advanced-menu-begin-style'), el: $('#shape-advanced-menu-begin-style'),
parentMenu: this.btnBeginStyleMenu, parentMenu: this.btnBeginStyleMenu,
store: new Common.UI.DataViewStore(_arrStyles), store: new Common.UI.DataViewStore(_arrStyles),
itemTemplate: _.template('<div id="<%= id %>" class="item-arrow" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-arrow img-arrows" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>')
}); });
this.mnuBeginStylePicker.on('item:click', _.bind(this.onSelectBeginStyle, this)); this.mnuBeginStylePicker.on('item:click', _.bind(this.onSelectBeginStyle, this));
this._selectStyleItem(this.btnBeginStyle, null); this._selectStyleItem(this.btnBeginStyle, null);
@ -433,7 +433,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
el: $('#shape-advanced-begin-size'), el: $('#shape-advanced-begin-size'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>', '<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -451,7 +451,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
el: $('#shape-advanced-menu-begin-size'), el: $('#shape-advanced-menu-begin-size'),
parentMenu: this.btnBeginSizeMenu, parentMenu: this.btnBeginSizeMenu,
store: new Common.UI.DataViewStore(_arrSize), store: new Common.UI.DataViewStore(_arrSize),
itemTemplate: _.template('<div id="<%= id %>" class="item-arrow" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-arrow img-arrows" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>')
}); });
this.mnuBeginSizePicker.on('item:click', _.bind(this.onSelectBeginSize, this)); this.mnuBeginSizePicker.on('item:click', _.bind(this.onSelectBeginSize, this));
this._selectStyleItem(this.btnBeginSize, null); this._selectStyleItem(this.btnBeginSize, null);
@ -466,7 +466,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
el: $('#shape-advanced-end-style'), el: $('#shape-advanced-end-style'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>', '<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -484,7 +484,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
el: $('#shape-advanced-menu-end-style'), el: $('#shape-advanced-menu-end-style'),
parentMenu: this.btnEndStyleMenu, parentMenu: this.btnEndStyleMenu,
store: new Common.UI.DataViewStore(_arrStyles), store: new Common.UI.DataViewStore(_arrStyles),
itemTemplate: _.template('<div id="<%= id %>" class="item-arrow" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-arrow img-arrows" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>')
}); });
this.mnuEndStylePicker.on('item:click', _.bind(this.onSelectEndStyle, this)); this.mnuEndStylePicker.on('item:click', _.bind(this.onSelectEndStyle, this));
this._selectStyleItem(this.btnEndStyle, null); this._selectStyleItem(this.btnEndStyle, null);
@ -493,7 +493,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
el: $('#shape-advanced-end-size'), el: $('#shape-advanced-end-size'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>', '<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -511,7 +511,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
el: $('#shape-advanced-menu-end-size'), el: $('#shape-advanced-menu-end-size'),
parentMenu: this.btnEndSizeMenu, parentMenu: this.btnEndSizeMenu,
store: new Common.UI.DataViewStore(_arrSize), store: new Common.UI.DataViewStore(_arrSize),
itemTemplate: _.template('<div id="<%= id %>" class="item-arrow" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-arrow img-arrows" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>')
}); });
this.mnuEndSizePicker.on('item:click', _.bind(this.onSelectEndSize, this)); this.mnuEndSizePicker.on('item:click', _.bind(this.onSelectEndSize, this));
this._selectStyleItem(this.btnEndSize, null); this._selectStyleItem(this.btnEndSize, null);

9
apps/presentationeditor/main/resources/less/advanced-settings.less
View file

@ -4,11 +4,9 @@
background-color: white; background-color: white;
&.image { &.image {
.background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
background-repeat: no-repeat;
background-position: 10px 0; background-position: 10px 0;
background-attachment: scroll; background-attachment: scroll;
background-color: white; background-color: @background-normal;
} }
} }
@ -22,8 +20,11 @@
} }
} }
.img-arrows {
.background-ximage-v2('right-panels/Begin-EndStyle.png', 480px, @commonimage: true);
}
.item-arrow { .item-arrow {
.background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
width:44px; width:44px;
height:20px; height:20px;
} }

16
apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -376,7 +376,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
el: $('#shape-advanced-begin-style'), el: $('#shape-advanced-begin-style'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>', '<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -394,7 +394,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
el: $('#shape-advanced-menu-begin-style'), el: $('#shape-advanced-menu-begin-style'),
parentMenu: this.btnBeginStyleMenu, parentMenu: this.btnBeginStyleMenu,
store: new Common.UI.DataViewStore(_arrStyles), store: new Common.UI.DataViewStore(_arrStyles),
itemTemplate: _.template('<div id="<%= id %>" class="item-arrow" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-arrow img-arrows" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>')
}); });
this.mnuBeginStylePicker.on('item:click', _.bind(this.onSelectBeginStyle, this)); this.mnuBeginStylePicker.on('item:click', _.bind(this.onSelectBeginStyle, this));
this._selectStyleItem(this.btnBeginStyle, null); this._selectStyleItem(this.btnBeginStyle, null);
@ -403,7 +403,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
el: $('#shape-advanced-begin-size'), el: $('#shape-advanced-begin-size'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>', '<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -421,7 +421,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
el: $('#shape-advanced-menu-begin-size'), el: $('#shape-advanced-menu-begin-size'),
parentMenu: this.btnBeginSizeMenu, parentMenu: this.btnBeginSizeMenu,
store: new Common.UI.DataViewStore(_arrSize), store: new Common.UI.DataViewStore(_arrSize),
itemTemplate: _.template('<div id="<%= id %>" class="item-arrow" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-arrow img-arrows" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>')
}); });
this.mnuBeginSizePicker.on('item:click', _.bind(this.onSelectBeginSize, this)); this.mnuBeginSizePicker.on('item:click', _.bind(this.onSelectBeginSize, this));
this._selectStyleItem(this.btnBeginSize, null); this._selectStyleItem(this.btnBeginSize, null);
@ -436,7 +436,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
el: $('#shape-advanced-end-style'), el: $('#shape-advanced-end-style'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>', '<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -454,7 +454,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
el: $('#shape-advanced-menu-end-style'), el: $('#shape-advanced-menu-end-style'),
parentMenu: this.btnEndStyleMenu, parentMenu: this.btnEndStyleMenu,
store: new Common.UI.DataViewStore(_arrStyles), store: new Common.UI.DataViewStore(_arrStyles),
itemTemplate: _.template('<div id="<%= id %>" class="item-arrow" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-arrow img-arrows" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>')
}); });
this.mnuEndStylePicker.on('item:click', _.bind(this.onSelectEndStyle, this)); this.mnuEndStylePicker.on('item:click', _.bind(this.onSelectEndStyle, this));
this._selectStyleItem(this.btnEndStyle, null); this._selectStyleItem(this.btnEndStyle, null);
@ -463,7 +463,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
el: $('#shape-advanced-end-size'), el: $('#shape-advanced-end-size'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>', '<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>', '<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>' '</div>'
@ -481,7 +481,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
el: $('#shape-advanced-menu-end-size'), el: $('#shape-advanced-menu-end-size'),
parentMenu: this.btnEndSizeMenu, parentMenu: this.btnEndSizeMenu,
store: new Common.UI.DataViewStore(_arrSize), store: new Common.UI.DataViewStore(_arrSize),
itemTemplate: _.template('<div id="<%= id %>" class="item-arrow" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-arrow img-arrows" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>')
}); });
this.mnuEndSizePicker.on('item:click', _.bind(this.onSelectEndSize, this)); this.mnuEndSizePicker.on('item:click', _.bind(this.onSelectEndSize, this));
this._selectStyleItem(this.btnEndSize, null); this._selectStyleItem(this.btnEndSize, null);

9
apps/spreadsheeteditor/main/resources/less/advanced-settings.less
View file

@ -4,11 +4,9 @@
background-color: white; background-color: white;
&.image { &.image {
.background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
background-repeat: no-repeat;
background-position: 10px 0; background-position: 10px 0;
background-attachment: scroll; background-attachment: scroll;
background-color: white; background-color: @background-normal;
} }
} }
@ -22,8 +20,11 @@
} }
} }
.img-arrows {
.background-ximage-v2('right-panels/Begin-EndStyle.png', 480px, @commonimage: true);
}
.item-arrow { .item-arrow {
.background-ximage('@{common-image-path}/right-panels/Begin-EndStyle.png', '@{common-image-path}/right-panels/Begin-EndStyle@2x.png', 480px);
width:44px; width:44px;
height:20px; height:20px;
} }