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

Update bootstrap (fix dropdown menu)

Browse source
This commit is contained in:
JuliaSvinareva 2020-09-30 11:06:48 +03:00
parent ca57c48a2b
commit 25f232e839
12 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/ComboBorderSize.js
View file

@ -82,7 +82,7 @@ define([
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-reference="parent"><span class="caret img-commonctrl"></span></button>', '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-reference="parent"><span class="caret img-commonctrl"></span></button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">', '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>', '<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" class="dropdown-item" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">', '<li id="<%= item.id %>" data-value="<%= item.value %>"><a class="dropdown-item" tabindex="-1" type="menuitem">',
'<span><%= item.displayValue %></span>', '<span><%= item.displayValue %></span>',
'<% if (item.offsety!==undefined) { %>', '<% if (item.offsety!==undefined) { %>',
'<img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" align="right" style="background-position: 0 -<%= item.offsety %>px;">', '<img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" align="right" style="background-position: 0 -<%= item.offsety %>px;">',

1
apps/common/main/lib/component/ComboBox.js
View file

@ -265,6 +265,7 @@ define([
_.delay(function(){ _.delay(function(){
me.cmpEl.addClass('show'); me.cmpEl.addClass('show');
me.cmpEl.find('.dropdown-menu').addClass('show');
}, delay || 0); }, delay || 0);
}, },

4
apps/common/main/lib/component/ComboBoxFonts.js
View file

@ -381,8 +381,8 @@ define([
onInsertItem: function(item) { onInsertItem: function(item) {
$(this.el).find('ul').prepend(_.template([ $(this.el).find('ul').prepend(_.template([
'<li id="<%= item.id %>" class="dropdown-item">', '<li id="<%= item.id %>">',
'<a class="font-item" tabindex="-1" type="menuitem" style="height:<%=scope.getListItemHeight()%>px;"></a>', '<a class="font-item dropdown-item" tabindex="-1" type="menuitem" style="height:<%=scope.getListItemHeight()%>px;"></a>',
'</li>' '</li>'
].join(''))({ ].join(''))({
item: item.attributes, item: item.attributes,

2
apps/common/main/lib/view/LanguageDialog.js
View file

@ -113,7 +113,7 @@ define([
close: function(suppressevent) { close: function(suppressevent) {
var $window = this.getChild(); var $window = this.getChild();
if (!$window.find('.combobox.open').length) { if (!$window.find('.combobox.show').length) {
Common.UI.Window.prototype.close.call(this, arguments); Common.UI.Window.prototype.close.call(this, arguments);
} }
}, },

12
apps/common/main/resources/less/buttons.less
View file

@ -170,7 +170,7 @@
display: inline-flex; display: inline-flex;
flex-direction: column; flex-direction: column;
&.open, &.show,
&.over { &.over {
&.split { &.split {
> .inner-box-icon { > .inner-box-icon {
@ -434,7 +434,7 @@
} }
} }
&.open { &.show {
> .btn-toolbar { > .btn-toolbar {
//color: lighten(@gray-lighter, 10%); //color: lighten(@gray-lighter, 10%);
@ -502,7 +502,7 @@
&.split { &.split {
&.over:not(.disabled), &.over:not(.disabled),
&.open { &.show {
box-shadow: inset 0 0 0 1px @color-gray; box-shadow: inset 0 0 0 1px @color-gray;
button:not(.active):not(.btn-text-split-default) { button:not(.active):not(.btn-text-split-default) {
@ -525,7 +525,7 @@
} }
} }
&.open { &.show {
> button:not(.active) { > button:not(.active) {
&:last-of-type { &:last-of-type {
background-color: @color-dark; background-color: @color-dark;
@ -606,6 +606,10 @@
.box-shadow(none); .box-shadow(none);
background-color: transparent; background-color: transparent;
&:focus {
box-shadow: inset 0 0 0 1px @gray;
}
&.bg-white { &.bg-white {
background-color: #fff; background-color: #fff;
} }

4
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -806,13 +806,13 @@ define([
} }
var statusbar = DE.getController('Statusbar'); var statusbar = DE.getController('Statusbar');
var menu_opened = statusbar.statusbar.$el.find('.open > [data-toggle="dropdown"]'); var menu_opened = statusbar.statusbar.$el.find('.show > [data-toggle="dropdown"]');
if (menu_opened.length) { if (menu_opened.length) {
$.fn.dropdown.Constructor.prototype.keydown.call(menu_opened[0], e); $.fn.dropdown.Constructor.prototype.keydown.call(menu_opened[0], e);
return false; return false;
} }
if (this.mode.canPlugins && this.leftMenu.panelPlugins) { if (this.mode.canPlugins && this.leftMenu.panelPlugins) {
menu_opened = this.leftMenu.panelPlugins.$el.find('#menu-plugin-container.open > [data-toggle="dropdown"]'); menu_opened = this.leftMenu.panelPlugins.$el.find('#menu-plugin-container.show > [data-toggle="dropdown"]');
if (menu_opened.length) { if (menu_opened.length) {
$.fn.dropdown.Constructor.prototype.keydown.call(menu_opened[0], e); $.fn.dropdown.Constructor.prototype.keydown.call(menu_opened[0], e);
return false; return false;

4
apps/documenteditor/main/app/template/RightMenu.template
View file

@ -28,7 +28,7 @@
<button id="id-right-menu-shape" class="btn btn-category arrow-left" content-target="id-shape-settings"><i class="icon toolbar__icon btn-menu-shape">&nbsp;</i></button> <button id="id-right-menu-shape" class="btn btn-category arrow-left" content-target="id-shape-settings"><i class="icon toolbar__icon btn-menu-shape">&nbsp;</i></button>
<button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button> <button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>
<button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button> <button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>
<button id="id-right-menu-mail-merge" class="btn btn-category arrow-left hidden" content-target="id-mail-merge-settings"><i class="icon toolbar__icon btn-mailmerge">&nbsp;</i></button> <button id="id-right-menu-mail-merge" class="btn btn-category arrow-left d-none" content-target="id-mail-merge-settings"><i class="icon toolbar__icon btn-mailmerge">&nbsp;</i></button>
<button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button> <button id="id-right-menu-signature" class="btn btn-category arrow-left d-none" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
</div> </div>
</div> </div>

2
apps/documenteditor/main/app/view/Statusbar.js
View file

@ -233,7 +233,7 @@ define([
style: 'margin-top:-5px;', style: 'margin-top:-5px;',
restoreHeight: 285, restoreHeight: 285,
itemTemplate: _.template([ itemTemplate: _.template([
'<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %>">', '<a id="<%= id %>" class="dropdown-item" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %>">',
'<i class="icon <% if (spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>', '<i class="icon <% if (spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
'<%= caption %>', '<%= caption %>',
'</a>' '</a>'

4
apps/documenteditor/main/resources/less/rightmenu.less
View file

@ -166,13 +166,13 @@
.btn-edit-table {background-position: 0 0;} .btn-edit-table {background-position: 0 0;}
button.over .btn-edit-table {background-position: -28px 0;} button.over .btn-edit-table {background-position: -28px 0;}
.btn-group.open .btn-edit-table, .btn-group.show .btn-edit-table,
button.active:not(.disabled) .btn-edit-table, button.active:not(.disabled) .btn-edit-table,
button:active:not(.disabled) .btn-edit-table {background-position: -56px 0;} button:active:not(.disabled) .btn-edit-table {background-position: -56px 0;}
.btn-change-shape {background-position: 0 -16px;} .btn-change-shape {background-position: 0 -16px;}
button.over .btn-change-shape {background-position: -28px -16px;} button.over .btn-change-shape {background-position: -28px -16px;}
.btn-group.open .btn-change-shape, .btn-group.show .btn-change-shape,
button.active:not(.disabled) .btn-change-shape, button.active:not(.disabled) .btn-change-shape,
button:active:not(.disabled) .btn-change-shape {background-position: -56px -16px;} button:active:not(.disabled) .btn-change-shape {background-position: -56px -16px;}

6
apps/documenteditor/main/resources/less/statusbar.less
View file

@ -78,6 +78,12 @@
color: #000; color: #000;
margin-left: 6px; margin-left: 6px;
.caret {
display: inline-block;
margin-left: 2px;
vertical-align: middle;
}
.caret.up { .caret.up {
background-position: @arrow-up-small-offset-x @arrow-up-small-offset-y; background-position: @arrow-up-small-offset-x @arrow-up-small-offset-y;

2
apps/presentationeditor/main/app/template/RightMenu.template
View file

@ -26,6 +26,6 @@
<button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button> <button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button>
<button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button> <button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>
<button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button> <button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>
<button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button> <button id="id-right-menu-signature" class="btn btn-category arrow-left d-none" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
</div> </div>
</div> </div>

2
apps/spreadsheeteditor/main/app/template/RightMenu.template
View file

@ -32,6 +32,6 @@
<button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button> <button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>
<button id="id-right-menu-pivot" class="btn btn-category arrow-left" content-target="id-pivot-settings"><i class="icon toolbar__icon btn-pivot-sum">&nbsp;</i></button> <button id="id-right-menu-pivot" class="btn btn-category arrow-left" content-target="id-pivot-settings"><i class="icon toolbar__icon btn-pivot-sum">&nbsp;</i></button>
<button id="id-right-menu-slicer" class="btn btn-category arrow-left" content-target="id-slicer-settings"><i class="icon toolbar__icon btn-slicer">&nbsp;</i></button> <button id="id-right-menu-slicer" class="btn btn-category arrow-left" content-target="id-slicer-settings"><i class="icon toolbar__icon btn-slicer">&nbsp;</i></button>
<button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button> <button id="id-right-menu-signature" class="btn btn-category arrow-left d-none" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
</div> </div>
</div> </div>