[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a414ce2787ae47cfd9a078dd17a9403c32c0e3fc
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Dec 16 18:44:40 2016 +0530

    loleaflet: Don't move items to 'toolbar-more' after resizebreak
    
    Change-Id: I9660e84f68cde2ab5eed6871d4f3948a736575b9
    Reviewed-on: https://gerrit.libreoffice.org/32088
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>
    (cherry picked from commit 98036fd90935663263ad4a1be25c7c57e930825b)
    Reviewed-on: https://gerrit.libreoffice.org/32090
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index dd698e3..692b39b 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -27,6 +27,9 @@ function resizeToolbar() {
 	// move items from toolbar-up -> toolbar-up-more
 	while ($('#toolbar-up')[0].scrollWidth > Math.max($(window).width(), parseInt($('body').css('min-width')))) {
 		var itemId = toolbarUp.items[toolbarUp.items.length - 4].id;
+		if (itemId === 'resizebreak') {
+			return;
+		}
 		item = toolbarUp.get(itemId);
 		toolbarUp.remove(itemId);
 		toolbarUpMore.insert(toolbarUpMore.items[0], item);
@@ -348,7 +351,7 @@ $(function () {
 			{type: 'html',   id: 'styles', html: '<select class="styles-select"></select>'},
 			{type: 'html',   id: 'fonts', html: '<select class="fonts-select"></select>'},
 			{type: 'html',   id: 'fontsizes', html: '<select class="fontsizes-select"></select>'},
-			{type: 'break'},
+			{type: 'break', id: 'resizebreak'},
 			{type: 'button',  id: 'bold',  img: 'bold', hint: _('Bold'), uno: 'Bold'},
 			{type: 'button',  id: 'italic', img: 'italic', hint: _('Italic'), uno: 'Italic'},
 			{type: 'button',  id: 'underline',  img: 'underline', hint: _('Underline'), uno: 'Underline'},