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

[Andras Timar]

 loleaflet/dist/images/lc_insertfootnote.svg |    1 -
 loleaflet/dist/toolbar.css                  |    1 -
 loleaflet/dist/toolbar/toolbar.js           |   16 ----------------
 3 files changed, 18 deletions(-)

New commits:
commit b1750f04f8945e76801c5adfa3adc2c525849c72
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Mar 27 15:46:14 2017 +0200

    Revert "Add footnote and text wrap functions"
    
    Change-Id: I59d374d3f8bdfa6a3b871bdec5389a53bb3a9da9

diff --git a/loleaflet/dist/images/lc_insertfootnote.svg b/loleaflet/dist/images/lc_insertfootnote.svg
deleted file mode 100644
index 9907b8b3..00000000
--- a/loleaflet/dist/images/lc_insertfootnote.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><g transform="translate(1 -1029.3622)"><path d="m5 4v16h1 6v-1h-6v-14h12v8h1v-9h-1-12zm2 3v1h10v-1zm0 2v1h6v-1zm0 5v1h7v-1z" fill="#4d4d4d" transform="translate(-1 1029.3622)"/><path d="m16 1043.3622l-1 2h1v4h1v-6z" fill="#1d99f3"/><path d="m6 1045.3622h7v1.0000348h-7z" fill="#1d99f3"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 31d3d209..6564ae95 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -285,7 +285,6 @@ button.leaflet-control-search-next
 .w2ui-icon.save{ background: url('../images/lc_save.svg') no-repeat center !important; }
 .w2ui-icon.saveas{ background: url('../images/lc_saveas.svg') no-repeat center !important; }
 .w2ui-icon.strikeout{ background: url('../images/lc_strikeout.svg') no-repeat center !important; }
-.w2ui-icon.insertfootnote{ background: url('../images/lc_insertfootnote.svg') no-repeat center !important; }
 .w2ui-icon.underline{ background: url('../images/lc_underline.svg') no-repeat center !important; }
 .w2ui-icon.undo{ background: url('../images/lc_undo.svg') no-repeat center !important; }
 .w2ui-icon.zoomin{ background: url('../images/plus.svg') no-repeat center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 05091a9f..4a24a8ff 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -284,11 +284,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();
 	}
@@ -458,15 +453,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')},
 			{type: 'break', id: 'savebreak'},
 			{type: 'button',  id: 'undo',  img: 'undo', hint: _('Undo'), uno: 'Undo', disabled: true},
@@ -482,8 +468,6 @@ $(function () {
 			{type: 'button',  id: 'underline',  img: 'underline', hint: _('Underline'), uno: 'Underline', disabled: true},
 			{type: 'button',  id: 'strikeout', img: 'strikeout', hint: _('Strikeout'), uno: 'Strikeout', disabled: true},
 			{type: 'break', id: 'formatbreak'},
-			{type: 'button',  id: 'insertfootnote', img: 'insertfootnote', hint: _('Insert Footnote'), uno: 'InsertFootnote' },
-			{type: 'break' },
 			{type: 'html',  id: 'fontcolor-html', html: '<div id="fontcolor-wrapper"><input id="fontColorPicker" style="display:none;"></div>'},
 			{type: 'button',  id: 'fontcolor', img: 'color', hint: _('Font color')},
 			{type: 'html',  id: 'backcolor-html', html: '<div id="backcolor-wrapper"><input id="backColorPicker" style="display:none;"></div>'},