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

[DE][PE] Bug 36801.

Browse source
This commit is contained in:
Julia Radzhabova 2018-02-07 15:14:20 +03:00
parent e92d353971
commit 1954fa34f3
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1601,8 +1601,9 @@ define([
this.btnMarkers.setMenu( this.btnMarkers.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
style: 'min-width: 139px',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 185px; margin: 0 5px;"></div>')} {template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 5px;"></div>')}
] ]
}) })
); );
@ -1670,7 +1671,7 @@ define([
this.mnuMarkersPicker = new Common.UI.DataView({ this.mnuMarkersPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-markers'), el: $('#id-toolbar-menu-markers'),
parentMenu: this.btnMarkers.menu, parentMenu: this.btnMarkers.menu,
restoreHeight: 92, restoreHeight: 138,
allowScrollbar: false, allowScrollbar: false,
store: new Common.UI.DataViewStore([ store: new Common.UI.DataViewStore([
{offsety: 0, data: {type: 0, subtype: -1}}, {offsety: 0, data: {type: 0, subtype: -1}},
@ -1680,7 +1681,8 @@ define([
{offsety: 152, data: {type: 0, subtype: 4}}, {offsety: 152, data: {type: 0, subtype: 4}},
{offsety: 190, data: {type: 0, subtype: 5}}, {offsety: 190, data: {type: 0, subtype: 5}},
{offsety: 228, data: {type: 0, subtype: 6}}, {offsety: 228, data: {type: 0, subtype: 6}},
{offsety: 266, data: {type: 0, subtype: 7}} {offsety: 266, data: {type: 0, subtype: 7}},
{offsety: 684, data: {type: 0, subtype: 8}}
]), ]),
itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist" style="background-position: 0 -<%= offsety %>px;"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist" style="background-position: 0 -<%= offsety %>px;"></div>')
}); });

8
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -1213,8 +1213,9 @@ define([
this.btnMarkers.setMenu( this.btnMarkers.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
style: 'min-width: 139px',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 185px; margin: 0 5px;"></div>')} {template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 5px;"></div>')}
] ]
}) })
); );
@ -1241,7 +1242,7 @@ define([
this.mnuMarkersPicker = new Common.UI.DataView({ this.mnuMarkersPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-markers'), el: $('#id-toolbar-menu-markers'),
parentMenu: this.btnMarkers.menu, parentMenu: this.btnMarkers.menu,
restoreHeight: 92, restoreHeight: 138,
allowScrollbar: false, allowScrollbar: false,
store: new Common.UI.DataViewStore([ store: new Common.UI.DataViewStore([
{offsety: 0, data: {type: 0, subtype: -1}}, {offsety: 0, data: {type: 0, subtype: -1}},
@ -1251,7 +1252,8 @@ define([
{offsety: 152, data: {type: 0, subtype: 4}}, {offsety: 152, data: {type: 0, subtype: 4}},
{offsety: 190, data: {type: 0, subtype: 5}}, {offsety: 190, data: {type: 0, subtype: 5}},
{offsety: 228, data: {type: 0, subtype: 6}}, {offsety: 228, data: {type: 0, subtype: 6}},
{offsety: 266, data: {type: 0, subtype: 7}} {offsety: 266, data: {type: 0, subtype: 7}},
{offsety: 684, data: {type: 0, subtype: 8}}
]), ]),
itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist" style="background-position: 0 -<%= offsety %>px;"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist" style="background-position: 0 -<%= offsety %>px;"></div>')
}); });