[Libreoffice-commits] online.git: Branch 'libreoffice-6-2' - loleaflet/js

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Nov 28 20:20:51 UTC 2018


 loleaflet/js/toolbar.js |   14 --------------
 1 file changed, 14 deletions(-)

New commits:
commit 5e5221bd92e2bb229d9822228be4a0ad86fa12b6
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Wed Nov 28 17:28:36 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Nov 28 21:20:45 2018 +0100

    loleaflet: remove TextWrap menu from toolbar
    
    Since it's available already from the context menu.
    
    Change-Id: Ia79a5f21b2d757621a3cb8d7114b90617c6c2acf
    Reviewed-on: https://gerrit.libreoffice.org/64194
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 0b293580b..f4fc46c87 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -172,11 +172,6 @@ function onClick(e, id, item, subItem) {
 	else if (id === 'lastrecord') {
 		$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').scrollLeft() + 120);
 	}
-	else if (id.startsWith('menu-wrap:wrap-'))
-	{
-		var wrapType = id.substring('menu-wrap:wrap-'.length);
-		map.toggleCommandState(wrapType);
-	}
 	else if (id === 'insertgraphic' || item.id === 'localgraphic') {
 		L.DomUtil.get('insertgraphic').click();
 	}
@@ -618,15 +613,6 @@ var fontsizesSelectValue;
 
 function createToolbar() {
 	var toolItems = [
-		{type: 'menu', id: 'menu-wrap', caption: _('Textwrap'), mobile: false, items: [
-			{ text: _('No wrap'), id: 'wrap-WrapOff' },
-			{ text: _('Page wrap'), id: 'wrap-WrapOn' },
-			{ text: _('Wrap anchor only'), id: 'wrap-WrapAnchorOnly' },
-			{ text: _('Ideal wrap'), id: 'wrap-WrapIdeal' },
-			{ text: _('Left wrap'), id: 'wrap-WrapLeft' },
-			{ text: _('Right wrap'), id: 'wrap-WrapRight' },
-			{ text: _('Wrap through'), id: 'wrap-WrapThrough' }
-		]},
 		{type: 'button',  id: 'save', img: 'save', hint: _UNO('.uno:Save')},
 		{type: 'break', id: 'savebreak'},
 		{type: 'button',  id: 'undo',  img: 'undo', hint: _UNO('.uno:Undo'), uno: 'Undo', disabled: true, mobile: false},


More information about the Libreoffice-commits mailing list