[Libreoffice-commits] online.git: Branch 'private/Ashod/tilecombine' - loleaflet/dist

[Andras Timar]

 dev/null                          |binary
 loleaflet/dist/toolbar.css        |    1 -
 loleaflet/dist/toolbar/toolbar.js |   16 ----------------
 3 files changed, 17 deletions(-)

New commits:
commit d2b7d6a178f7654c29712370a9d47c1bd22df6d0
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Sep 1 17:20:14 2016 +0200

    Revert "Add footnote and text wrap functions"
    
    This reverts commit 5902700922d110aee29d67be6224094bb521132d.

diff --git a/loleaflet/dist/images/lc_insertfootnote.png b/loleaflet/dist/images/lc_insertfootnote.png
deleted file mode 100644
index 65b110f..0000000
Binary files a/loleaflet/dist/images/lc_insertfootnote.png and /dev/null differ
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index aef6e23..40f53f5 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -246,7 +246,6 @@ button.leaflet-control-search-next
 .w2ui-icon.save{ background: url('/loleaflet/dist/images/lc_save.png') no-repeat center !important; }
 .w2ui-icon.saveas{ background: url('/loleaflet/dist/images/lc_saveas.png') no-repeat center !important; }
 .w2ui-icon.strikeout{ background: url('/loleaflet/dist/images/lc_strikeout.png') no-repeat center !important; }
-.w2ui-icon.insertfootnote{ background: url('/loleaflet/dist/images/lc_insertfootnote.png') no-repeat center !important; }
 .w2ui-icon.underline{ background: url('/loleaflet/dist/images/lc_underline.png') no-repeat center !important; }
 .w2ui-icon.undo{ background: url('/loleaflet/dist/images/lc_undo.png') no-repeat center !important; }
 .w2ui-icon.zoomin{ background: url('/loleaflet/dist/images/plus.png') no-repeat center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index f6597f2..218bb46 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -171,11 +171,6 @@ function onClick(id, item, subItem) {
 	else if (id === 'lastrecord') {
 		$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').prop('scrollWidth'));
 	}
-	else if (id.startsWith('menu:wrap:wrap-'))
-	{
-		var wrapType = id.substring('menu:wrap:wrap-'.length);
-		map.toggleCommandState(wrapType);
-	}
 	else if (id === 'insertgraphic') {
 		L.DomUtil.get('insertgraphic').click();
 	}
@@ -334,15 +329,6 @@ $(function () {
 		name: 'toolbar-up',
 		items: [
 			{type: 'html', id: 'left'},
-			{type: 'menu', id: 'writer:menu:wrap', caption: _('Textwrap'), 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: _('Save'), uno: 'Save'},
 			{type: 'break'},
 			{type: 'button',  id: 'undo',  img: 'undo', hint: _('Undo'), uno: 'Undo'},
@@ -358,8 +344,6 @@ $(function () {
 			{type: 'button',  id: 'underline',  img: 'underline', hint: _('Underline'), uno: 'Underline'},
 			{type: 'button',  id: 'strikeout', img: 'strikeout', hint: _('Strikeout'), uno: 'Strikeout'},
 			{type: 'break'},
-			{type: 'button',  id: 'insertfootnote', img: 'insertfootnote', hint: _('Insert Footnote'), uno: 'InsertFootnote' },
-			{type: 'break' },
 			{type: 'html',  id: 'fontcolor-html', html: '<input id="fontColorPicker" style="display:none;">'},
 			{type: 'button',  id: 'fontcolor', img: 'color', hint: _('Font color')},
 			{type: 'html',  id: 'backcolor-html', html: '<input id="backColorPicker" style="display:none;">'},